WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #194 from zhangzhishan/master 

Fix space problem for getting lock file.
This commit is contained in:
Orsiris de Jong 2020-05-03 09:47:52 +02:00 committed by GitHub
parent 5881c71212 acf388bc7b
commit 7577f220dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/debug_osync.sh
View File

@ -3024,7 +3024,7 @@ function _HandleLocksLocal {
# Skip the whole part if overwrite true # Skip the whole part if overwrite true
if [ -s "$lockfile" ] && [ $overwrite != true ]; then if [ -s "$lockfile" ] && [ $overwrite != true ]; then
lockfileContent="$(head -c16384 $lockfile)" lockfileContent="$(head -c16384 "$lockfile")"
Logger "Master lock pid present: $lockfileContent" "DEBUG" Logger "Master lock pid present: $lockfileContent" "DEBUG"
lockPid="${lockfileContent%@*}" lockPid="${lockfileContent%@*}"
if [ $(IsInteger $lockPid) -ne 1 ]; then if [ $(IsInteger $lockPid) -ne 1 ]; then

2
dev/n_osync.sh
View File

@ -450,7 +450,7 @@ function _HandleLocksLocal {
# Skip the whole part if overwrite true # Skip the whole part if overwrite true
if [ -s "$lockfile" ] && [ $overwrite != true ]; then if [ -s "$lockfile" ] && [ $overwrite != true ]; then
lockfileContent="$(head -c16384 $lockfile)" lockfileContent="$(head -c16384 "$lockfile")"
Logger "Master lock pid present: $lockfileContent" "DEBUG" Logger "Master lock pid present: $lockfileContent" "DEBUG"
lockPid="${lockfileContent%@*}" lockPid="${lockfileContent%@*}"
if [ $(IsInteger $lockPid) -ne 1 ]; then if [ $(IsInteger $lockPid) -ne 1 ]; then

2
osync.sh
View File

@ -2859,7 +2859,7 @@ function _HandleLocksLocal {
# Skip the whole part if overwrite true # Skip the whole part if overwrite true
if [ -s "$lockfile" ] && [ $overwrite != true ]; then if [ -s "$lockfile" ] && [ $overwrite != true ]; then
lockfileContent="$(head -c16384 $lockfile)" lockfileContent="$(head -c16384 "$lockfile")"
Logger "Master lock pid present: $lockfileContent" "DEBUG" Logger "Master lock pid present: $lockfileContent" "DEBUG"
lockPid="${lockfileContent%@*}" lockPid="${lockfileContent%@*}"
if [ $(IsInteger $lockPid) -ne 1 ]; then if [ $(IsInteger $lockPid) -ne 1 ]; then