summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-07 19:28:39 +0100
committerErik Johnston <erik@matrix.org>2015-08-07 19:28:39 +0100
commit7dec0b2beeca1d1b7d298dc814fcfc5aff52340c (patch)
tree1579a8cec0170025627645ced547704cf2410605 /synapse/app/homeserver.py
parentBatch up various DB requests for event -> state (diff)
parentMerge pull request #212 from matrix-org/erikj/cache_deferreds (diff)
downloadsynapse-7dec0b2beeca1d1b7d298dc814fcfc5aff52340c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 49e27c9e11..f04493f92a 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -657,7 +657,8 @@ def run(hs):
 
     if hs.config.daemonize:
 
-        print hs.config.pid_file
+        if hs.config.print_pidfile:
+            print hs.config.pid_file
 
         daemon = Daemonize(
             app="synapse-homeserver",