This commit is contained in:
meejah 2022-09-17 16:41:17 -06:00
parent 8b2cb79070
commit 254a994eb5
2 changed files with 1 additions and 4 deletions

View File

@ -266,7 +266,7 @@ def run(reactor, config, runApp=twistd.runApp):
pidfile = FilePath(get_pidfile(config['basedir'])) pidfile = FilePath(get_pidfile(config['basedir']))
try: try:
check_pid_process(pidfile) check_pid_process(pidfile)
except ProcessInTheWay as e: except (ProcessInTheWay, InvalidPidFile) as e:
print("ERROR: {}".format(e)) print("ERROR: {}".format(e))
return 1 return 1
else: else:

View File

@ -47,9 +47,6 @@ from twisted.internet.defer import (
DeferredList, DeferredList,
) )
from twisted.python.filepath import FilePath from twisted.python.filepath import FilePath
from twisted.python.runtime import (
platform,
)
from allmydata.util import fileutil, pollmixin from allmydata.util import fileutil, pollmixin
from allmydata.util.encodingutil import unicode_to_argv from allmydata.util.encodingutil import unicode_to_argv
from allmydata.test import common_util from allmydata.test import common_util