Permission denied on unlink(lock/update.lock), easy fix, any chance it making it to origin?

[tsimmons]

Running the updater as a scheduled task on Windows 2008 R2 has for years led to the following log message every time the update runs:

E_WARNING (2) update.php:408 unlink(lock/update.lock): Permission denied 1. update.php(408): unlink(lock/update.lock)

It's not permissions ... it is because you cannot unlink a file that is still open in PHP running on Windows (the file pointer from make_lockfile() is still open when you hit line 408 of update.php.) Adding the following:

Code: Select all

fclose($lock_handle);


right before

Code: Select all

unlink(LOCK_DIRECTORY . "/$lock_filename");


clears this up. It's like opening and closing the door when leaving home instead of busting out a window and jumping.

Any chance of that making it into origin for us sorry Windows users? I hate having to modify core code and getting off track for using git pull updates.

See one of the original suggestions in this post.

Thanks &
Cheers.

[HeikoAdams]

Any chance of that making it into origin for us sorry Windows users?

Yes, submit a patch or start a merge request on tt-rss.org

[tsimmons]

Roger that. I wasn't registered with Andrew's gitlab installation, just did.

[tsimmons]

After registering, I created a branch for my proposed changes, committed them locally and tried to push a merge request but received:

remote: GitLab: You are not allowed to push code to this project.
To https://tt-rss.org/git/tt-rss.git
! [remote rejected] fclose-before-unlink-updater -> fclose-before-unlink-updater (pre-receive hook declined)
error: failed to push some refs to 'https://tt-rss.org/git/tt-rss.git'

I'm not a git pro (obviously) ... is there something Andrew has to do before I can push a merge request or am I doing it wrong?

[HeikoAdams]

You need to push your changes to your branch, not to master

[tsimmons]

Thought I had (my branch is called fclose-before-unlink-updater) ... used the following:

Code: Select all

git push origin fclose-before-unlink-updater


Maybe I need dev rights granted?

[fox]

before i merge anything, i think unlock is done in that fashion to prevent a possible race condition with lock files

so the patch should probably check the platform and only call fclose() explicitly on windows

e: op you should have correct permissions on gitlab now