summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-30 18:11:47 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-30 18:11:47 +0100
commit50c87b8eed628c0cae2e4bf2a60dff47ff21bbd4 (patch)
tree8e4449679cd374d50c72e9bda741d1be0eaefcfe /synapse
parentRemove the ~, comment the lines instead (diff)
downloadsynapse-50c87b8eed628c0cae2e4bf2a60dff47ff21bbd4.tar.xz
Allow "manhole" to be ommited from the config
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index cd9ca56158..f20d3fd389 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -23,7 +23,7 @@ class ServerConfig(Config):
         self.bind_port = config["bind_port"]
         self.bind_host = config["bind_host"]
         self.unsecure_port = config["unsecure_port"]
-        self.manhole = config["manhole"]
+        self.manhole = config.get("manhole")
         self.pid_file = self.abspath(config.get("pid_file"))
         self.web_client = config["web_client"]
         self.soft_file_limit = config["soft_file_limit"]