aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/config.py2
-rwxr-xr-xserver/server.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/server/config.py b/server/config.py
index f693468..755477b 100644
--- a/server/config.py
+++ b/server/config.py
@@ -11,6 +11,6 @@ class AliasConfigParser(ConfigParser.RawConfigParser):
self.host = self.get("component", "host")
self.secret = self.get("component", "secret")
self.port = self.getint("component", "port")
- self.background = self.get("component", "background")
+ self.background = self.getboolean("component", "background")
config = AliasConfigParser()
diff --git a/server/server.py b/server/server.py
index 3c80da8..7b39330 100755
--- a/server/server.py
+++ b/server/server.py
@@ -8,7 +8,7 @@ from sleekxmpp.xmlstream.xmlstream import XMLStream
from user import UserHandler
from config import filename, config
import daemon
-
+from lockfile.pidlockfile import PIDLockFile
class ObjectComponent(ComponentXMPP):
@@ -91,8 +91,10 @@ if __name__ == '__main__':
filename = args.config
logging.basicConfig(level = args.debug)
config.read(filename)
-
-with daemon.DaemonContext(detach_process=True,pid="alias_server.pid"):
+
+with daemon.DaemonContext(detach_process = config.background,
+ pidfile = PIDLockFile('alias.pid'),
+ working_directory = '.'):
component = ObjectComponent(config.name, config.secret,
config.host, config.port,
config.root)