Revision 4ed2e471 logic/dispatcher.py

b/logic/dispatcher.py
53 53

  
54 54
import time
55 55
import socket
56
from daemon import pidfile, daemon
56
from daemon import daemon
57

  
58
# Take care of differences between python-daemon versions.
59
try:
60
    from daemon import pidfile
61
except:
62
    from daemon import pidlockfile
57 63

  
58 64
from synnefo.logic import callbacks
59 65

  
......
248 254

  
249 255
    daemon_context.open()
250 256

  
251
    # Create pidfile
252
    pidf = pidfile.TimeoutPIDLockFile(opts.pid_file, 10)
257
    # Create pidfile. Take care of differences between python-daemon versions.
258
    try:
259
        pidf = pidfile.TimeoutPIDLockFile(opts.pid_file, 10)
260
    except:
261
        pidf = pidlockfile.TimeoutPIDLockFile(opts.pid_file, 10)
262

  
253 263
    pidf.acquire()
254 264

  
255 265
    logger.info("Became a daemon")

Also available in: Unified diff