linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

secop-server: import compability for daemon pkgs.

Browse Source 
Change-Id: I3884cbe4285fae5faa47633b89e92e64ae83ba16
This commit is contained in:
Alexander Lenz 2017-08-01 13:51:22 +02:00
parent d0b54eed1e
commit 5b20cec19f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
secop/server.py
View File

@ -29,7 +29,11 @@ import threading
import ConfigParser import ConfigParser
from daemon import DaemonContext from daemon import DaemonContext
from daemon.pidfile import TimeoutPIDLockFile
try:
import daemon.pidlockfile as pidlockfile
except ImportError:
import daemon.pidfile as pidlockfile
from secop.lib import get_class, formatException from secop.lib import get_class, formatException
from secop.protocol.dispatcher import Dispatcher from secop.protocol.dispatcher import Dispatcher
@ -57,7 +61,7 @@ class Server(object):
piddir = os.path.dirname(self._pidfile) piddir = os.path.dirname(self._pidfile)
if not os.path.isdir(piddir): if not os.path.isdir(piddir):
os.makedirs(piddir) os.makedirs(piddir)
pidfile = TimeoutPIDLockFile(self._pidfile) pidfile = pidlockfile.TimeoutPIDLockFile(self._pidfile)
if pidfile.is_locked(): if pidfile.is_locked():
self.log.error('Pidfile already exists. Exiting') self.log.error('Pidfile already exists. Exiting')