summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 15:51:15 +0100
commit9ea1de432dedf2130a036fc9eb9d0b8515a24fe8 (patch)
tree88753b866924c2d247ae9277d801fbcef1a0d513 /synapse/config/server.py
parentMerge branch 'develop' into server2server_tls (diff)
downloadsynapse-9ea1de432dedf2130a036fc9eb9d0b8515a24fe8.tar.xz
Fix homeserver config parsing
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 4a656b06ab..a3aceb521d 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import nacl.signing
-import socket
 import os
 from ._base import Config
 from syutil.base64util import encode_base64, decode_base64
@@ -28,7 +27,9 @@ class ServerConfig(Config):
         self.bind_port = args.bind_port
         self.bind_host = args.bind_host
         self.daemonize = args.daemonize
-        self.pid_file = os.path.abspath(args.pid_file)
+        self.pid_file = self.abspath(args.pid_file)
+        self.webclient = not args.no_webclient
+        self.manhole = args.manhole
 
     @classmethod
     def add_arguments(cls, parser):
@@ -44,11 +45,11 @@ class ServerConfig(Config):
                                   help="Local interface to listen on")
         server_group.add_argument("-D", "--daemonize", action='store_true',
                                   help="Daemonize the home server")
-        server_group.add_argument('--pid-file', default = "hs.pid",
+        server_group.add_argument('--pid-file', default="hs.pid",
                                   help="When running as a daemon, the file to"
                                   " store the pid in")
-        server_group.add_argument("-W", "--no-webclient", dest="webclient",
-                                  default=True, action="store_false",
+        server_group.add_argument("-W", "--no-webclient", default=True,
+                                  action="store_false",
                                   help="Don't host a web client.")
         server_group.add_argument("--manhole", dest="manhole", type=int,
                                   help="Turn on the twisted telnet manhole"