open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server-stop: ignore missing twistd.pid

Browse Source 
I changed my mind, it's actually easier if 'wormhole-server stop' (and
'restart') does *not* throw an error when there wasn't already a server
running in that directory. Specifically that lets me use 'restart' as an
idempotent "make sure a server is running" command.
This commit is contained in:
Brian Warner 2016-06-23 18:25:02 -07:00
parent f0c32617d0
commit 6d00576ee4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/server/cmd_server.py
View File

@ -1,6 +1,5 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import os, time import os, time
import click
from twisted.python import usage from twisted.python import usage
from twisted.scripts import twistd from twisted.scripts import twistd
@ -39,9 +38,9 @@ def kill_server():
try: try:
f = open("twistd.pid", "r") f = open("twistd.pid", "r")
except EnvironmentError: except EnvironmentError:
raise click.UsageError( print("Unable to find twistd.pid: is this really a server directory?")
"Unable to find 'twistd.pid' -- is this really a server directory?" print("oh well, ignoring 'stop'")
) return
pid = int(f.read().strip()) pid = int(f.read().strip())
f.close() f.close()
os.kill(pid, 15) os.kill(pid, 15)