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

Removed legacy lockfile code from init script

This commit is contained in:
deajan 2015-04-13 17:26:12 +02:00
parent 447bd7f36d
commit aef10c2808
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ UNDER WORK
RECENT CHANGES RECENT CHANGES
-------------- --------------
- Removed legacy lockfile code from init script
- Removed hardcoded program name from init script - Removed hardcoded program name from init script
- 01 Avr. 2015: Osync v1.00pre - 01 Avr. 2015: Osync v1.00pre
- Improved and refactored the soft deletion routine by merging conflict backup and soft deletion - Improved and refactored the soft deletion routine by merging conflict backup and soft deletion

7
osync-srv
View File

@ -11,8 +11,7 @@ progexec=osync.sh
progpath=/usr/local/bin progpath=/usr/local/bin
confdir=/etc/osync confdir=/etc/osync
pidfile=/var/run/$prog pidfile=/var/run/$prog
lockfile=/var/lock/subsys/$prog SCRIPT_BUILD=1304201502
SCRIPT_BUILD=1304201501
if [ ! -f $progpath/$progexec ] && [ ! -f $progexec ] if [ ! -f $progpath/$progexec ] && [ ! -f $progexec ]
then then
@ -84,7 +83,7 @@ stop() {
fi fi
else else
rm -f $pfile rm -f $pfile
echo "$pfile is dead but lockfile exists." echo "$prog instance $pfile (pid $(cat $pfile)) is dead but pidfile exists."
fi fi
done done
} }
@ -104,7 +103,7 @@ status() {
then then
echo "$prog instance $(basename $pfile) is running (pid $(cat $pfile))" echo "$prog instance $(basename $pfile) is running (pid $(cat $pfile))"
else else
echo "$pfile is dead but lockfile exists." echo "$prog instance $pfile (pid $(cat $pfile)) is dead but pidfile exists."
$errno=1 $errno=1
fi fi
done done