Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop

Browse Source
This commit is contained in:
Erik Johnston 2015-02-17 17:30:11 +00:00
commit 1177245e86
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/app/homeserver.py
View File

@ -14,6 +14,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import sys
sys.dont_write_bytecode = True
from synapse.storage import prepare_database, UpgradeDatabaseException from synapse.storage import prepare_database, UpgradeDatabaseException
from synapse.server import HomeServer from synapse.server import HomeServer
@ -49,7 +52,6 @@ import synapse
import logging import logging
import os import os
import re import re
import sys
import sqlite3 import sqlite3
import syweb import syweb

2
synapse/app/synctl.py
View File

@ -19,7 +19,7 @@ import os
import subprocess import subprocess
import signal import signal
SYNAPSE = ["python", "-m", "synapse.app.homeserver"] SYNAPSE = ["python", "-B", "-m", "synapse.app.homeserver"]
CONFIGFILE = "homeserver.yaml" CONFIGFILE = "homeserver.yaml"
PIDFILE = "homeserver.pid" PIDFILE = "homeserver.pid"