pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes issue where a daemonized OctoPrint doesn't clean up after itself after receiving SIGTERM.

Browse source
This commit is contained in:
Rob Speed 2015-01-10 00:24:25 -08:00
parent 3d5fdf2a91
commit 6c78049886
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/octoprint/daemon.py
View file

@ -4,7 +4,7 @@ Generic linux daemon base class for python 3.x
Originally from http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/#c35
"""
import sys, os, time, atexit, signal
import sys, os, time, signal
class Daemon:
"""A generic daemon class.
@ -53,14 +53,15 @@ class Daemon:
os.dup2(se.fileno(), sys.stderr.fileno())
# write pidfile
atexit.register(self.delpid)
signal.signal(signal.SIGTERM,self.delpid)
pid = str(os.getpid())
with open(self.pidfile,'w+') as f:
f.write(pid + '\n')
def delpid(self):
def delpid(self, _signo, _stack_frame):
os.remove(self.pidfile)
sys.exit(0)
def start(self):
"""Start the daemon."""