ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

startstop_node.py: when restarting, tolerate a stale pid too

Browse Source
This commit is contained in:
Brian Warner 2009-02-25 19:52:45 -07:00
parent 63b19e567c
commit 7c35f01073
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/scripts/startstop_node.py
View File

@ -111,6 +111,8 @@ def do_stop(basedir, out=sys.stdout, err=sys.stderr):
pidfile = os.path.join(basedir, "twistd.pid") pidfile = os.path.join(basedir, "twistd.pid")
if not os.path.exists(pidfile): if not os.path.exists(pidfile):
print >>err, "%s does not look like a running node directory (no twistd.pid)" % basedir print >>err, "%s does not look like a running node directory (no twistd.pid)" % basedir
# we define rc=2 to mean "nothing is running, but it wasn't me who
# stopped it"
return 2 return 2
pid = open(pidfile, "r").read() pid = open(pidfile, "r").read()
pid = int(pid) pid = int(pid)
@ -125,7 +127,7 @@ def do_stop(basedir, out=sys.stdout, err=sys.stderr):
print oserr.strerror print oserr.strerror
# the process didn't exist, so wipe the pid file # the process didn't exist, so wipe the pid file
os.remove(pidfile) os.remove(pidfile)
return 1 return 2
else: else:
raise raise
try: try:
@ -157,6 +159,7 @@ def do_stop(basedir, out=sys.stdout, err=sys.stderr):
(pid, (time.time() - start)) (pid, (time.time() - start))
wait = 10 wait = 10
time.sleep(1) time.sleep(1)
# we define rc=1 to mean "I think something is still running, sorry"
return 1 return 1
def start(config, stdout, stderr): def start(config, stdout, stderr):