summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 17:29:55 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 17:29:55 +0000
commit20e3172f38c10e03bb66a782e17c30f42948f8e8 (patch)
treeb5a2402b3423311337de73b770a25b758e3125f1
parentMerge pull request #76 from matrix-org/consumeErrors (diff)
parentDon't write bytecode (diff)
downloadsynapse-20e3172f38c10e03bb66a782e17c30f42948f8e8.tar.xz
Merge pull request #75 from matrix-org/dont_write_bytecode
Don't write bytecode
-rwxr-xr-xsynapse/app/homeserver.py4
-rwxr-xr-xsynapse/app/synctl.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f5681fac20..18585e87f2 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -14,6 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+sys.dont_write_bytecode = True
+
 from synapse.storage import prepare_database, UpgradeDatabaseException
 
 from synapse.server import HomeServer
@@ -48,7 +51,6 @@ import synapse
 import logging
 import os
 import re
-import sys
 import sqlite3
 import syweb
 
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py
index 363c20f994..3a70a248dc 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -19,7 +19,7 @@ import os
 import subprocess
 import signal
 
-SYNAPSE = ["python", "-m", "synapse.app.homeserver"]
+SYNAPSE = ["python", "-B", "-m", "synapse.app.homeserver"]
 
 CONFIGFILE = "homeserver.yaml"
 PIDFILE = "homeserver.pid"