apo/mailcap-agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix startup, improve killing of old servers

Browse Source
This commit is contained in:
Lynn Ochs 2019-05-21 19:14:53 +02:00
parent 49cd825383
commit 775f89be52
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mailcap-server.py
View File

@ -161,9 +161,10 @@ if __name__ == "__main__":
parser.add_argument('--no-daemonize', '-n', action='store_true') parser.add_argument('--no-daemonize', '-n', action='store_true')
parser.add_argument('--socket', '-s', default=os.path.join(os.environ['HOME'], '.mailcap.sock')) parser.add_argument('--socket', '-s', default=os.path.join(os.environ['HOME'], '.mailcap.sock'))
parser.add_argument('--dir', '-d', default=None) parser.add_argument('--dir', '-d', default=None)
parser.add_argument('--force', '-f', action='store_true')
args = parser.parse_args() args = parser.parse_args()
if args.action == 'kill': if args.action == 'kill' or args.force:
if os.path.exists(args.socket): if os.path.exists(args.socket):
os.remove(args.socket) os.remove(args.socket)
if os.path.exists(args.pid): if os.path.exists(args.pid):
@ -171,11 +172,12 @@ if __name__ == "__main__":
try: try:
os.kill(pid, 3) os.kill(pid, 3)
except ProcessLookupError as e: except ProcessLookupError as e:
print("Failed to kill process with pid %d:" % (pid,), str(e)) if args.action == 'kill':
print("Failed to kill process with pid %d:" % (pid,), str(e))
os.remove(args.pid) os.remove(args.pid)
if os.path.exists(args.socket): if os.path.exists(args.socket):
os.remove(args.socket) os.remove(args.socket)
elif args.action == 'run': if args.action == 'run':
if os.path.exists(args.pid): if os.path.exists(args.pid):
print("Already running with pid %d" % (int(open(args.pid).read()),)) print("Already running with pid %d" % (int(open(args.pid).read()),))
exit() exit()
@ -186,4 +188,4 @@ if __name__ == "__main__":
run_server(args) run_server(args)
else: else:
with daemon.DaemonContext(): with daemon.DaemonContext():
run_server() run_server(args)