|
|
|
@ -13,9 +13,9 @@ import threading
@@ -13,9 +13,9 @@ import threading
|
|
|
|
|
import daemon |
|
|
|
|
# workaround for python-daemon >= 1.6 |
|
|
|
|
try: |
|
|
|
|
import daemon.pidlockfile |
|
|
|
|
import daemon.pidlockfile as pidfile |
|
|
|
|
except ImportError: |
|
|
|
|
import daemon.pidfile |
|
|
|
|
import daemon.pidfile as pidfile |
|
|
|
|
|
|
|
|
|
class Thread(threading.Thread): |
|
|
|
|
|
|
|
|
@ -147,7 +147,7 @@ else:
@@ -147,7 +147,7 @@ else:
|
|
|
|
|
|
|
|
|
|
if not args.debug and not args.verbose: |
|
|
|
|
# get pid object for daemon |
|
|
|
|
pid = daemon.pidlockfile.TimeoutPIDLockFile(config['pid_file'], 10) |
|
|
|
|
pid = pidfile.TimeoutPIDLockFile(config['pid_file'], 10) |
|
|
|
|
# create daemon context |
|
|
|
|
d = daemon.DaemonContext(pidfile=pid, umask=077) |
|
|
|
|
# write stderr to logfile # FIXME: and how we will deal with log rotation? |
|
|
|
|