diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 17:30:11 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 17:30:11 +0000 |
| commit | 1177245e8617709c32adeeae67781d2940da9ffd (patch) | |
| tree | bb232668b5b12d58d2a1a1834928ce5a2a6011e8 | |
| parent | Use absolute path when loading delta sql files (diff) | |
| parent | Merge pull request #75 from matrix-org/dont_write_bytecode (diff) | |
| download | synapse-1177245e8617709c32adeeae67781d2940da9ffd.tar.xz | |
Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop
| -rwxr-xr-x | synapse/app/homeserver.py | 4 | ||||
| -rwxr-xr-x | synapse/app/synctl.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 27b478a1c3..54a7b70b63 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 @@ -49,7 +52,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" |