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

Correct exit code when no twistd.pid file

Browse Source
This commit is contained in:
meejah 2016-06-22 01:25:47 -06:00
parent e16b53817e
commit c4cd4db30e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/errors.py
View File

@ -1,5 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import functools import functools
import click
class ServerError(Exception): class ServerError(Exception):
def __init__(self, message, relay): def __init__(self, message, relay):
@ -47,7 +48,11 @@ class KeyFormatError(Exception):
class ReflectionAttack(Exception): class ReflectionAttack(Exception):
"""An attacker (or bug) reflected our outgoing message back to us.""" """An attacker (or bug) reflected our outgoing message back to us."""
class UsageError(Exception): # Click needs to receive click.UsageError instances to "do the right
# thing", which is print the error and exit -- perhaps it would be
# better just to re-export click.UsageError here? Or use
# click.UsageError throughout the codebase?
class UsageError(click.UsageError, Exception):
"""The programmer did something wrong.""" """The programmer did something wrong."""
class WormholeClosedError(UsageError): class WormholeClosedError(UsageError):

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

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