summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-01 14:34:48 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-01 14:34:55 +0100
commit3bcdf3664c34110d5cdb1f1936cd97c3b3fe4b42 (patch)
tree523106fa2fc491ef75e1ef2caa3f08800ebf3533
parentDon't use self.execute: it's designed for fetching stuff (diff)
downloadsynapse-3bcdf3664c34110d5cdb1f1936cd97c3b3fe4b42.tar.xz
Use the daemonize key from the config if it exists
-rw-r--r--synapse/config/server.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index f20d3fd389..78195b3a4f 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -27,6 +27,7 @@ class ServerConfig(Config):
         self.pid_file = self.abspath(config.get("pid_file"))
         self.web_client = config["web_client"]
         self.soft_file_limit = config["soft_file_limit"]
+        self.daemonize = config.get("daemonize")
 
         # Attempt to guess the content_addr for the v0 content repostitory
         content_addr = config.get("content_addr")
@@ -89,11 +90,13 @@ class ServerConfig(Config):
     def read_arguments(self, args):
         if args.manhole is not None:
             self.manhole = args.manhole
-        self.daemonize = args.daemonize
+        if args.daemonize is not None:
+            self.daemonize = args.daemonize
 
     def add_arguments(self, parser):
         server_group = parser.add_argument_group("server")
         server_group.add_argument("-D", "--daemonize", action='store_true',
+                                  default=None,
                                   help="Daemonize the home server")
         server_group.add_argument("--manhole", metavar="PORT", dest="manhole",
                                   type=int,