merge stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Thu, 03 Jun 2010 15:13:41 +0200
branchstable
changeset 5660 97343804414b
parent 5659 755f56f01c9d (diff)
parent 5657 8f56691f01de (current diff)
child 5661 84ef08bbda3c
merge
etwist/server.py
--- a/etwist/server.py	Thu Jun 03 13:20:07 2010 +0200
+++ b/etwist/server.py	Thu Jun 03 15:13:41 2010 +0200
@@ -42,7 +42,6 @@
 from cubicweb.web import dumps
 
 from logilab.common.decorators import monkeypatch
-from logilab.common.daemon import daemonize
 
 from cubicweb import AuthenticationError, ConfigurationError, CW_EVENT_MANAGER
 from cubicweb.web import Redirect, DirectResponse, StatusResponse, LogOut
@@ -395,6 +394,7 @@
         if sys.platform == 'win32':
             raise ConfigurationError("Under windows, you must use the service management "
                                      "commands (e.g : 'net start my_instance)'")
+        from logilab.common.daemon import daemonize
         print 'instance starting in the background'
         if daemonize(config['pid-file']):
             return # child process