Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-19 06:57:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into request_logging

Browse source 
Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
This commit is contained in:
Mark Haines 2014-11-14 11:16:50 +00:00
commit e903c941cb
208 changed files with 8887 additions and 19461 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/app/homeserver.py
View file

@ -43,6 +43,7 @@ import os
import re
import sys
import sqlite3
import syweb
logger = logging.getLogger(__name__)
@ -59,7 +60,9 @@ class SynapseHomeServer(HomeServer):
return JsonResource()
def build_resource_for_web_client(self):
return File("webclient") # TODO configurable?
syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient")
return File(webclient_path) # TODO configurable?
def build_resource_for_content_repo(self):
return ContentRepoResource(
@ -234,7 +237,10 @@ def setup():
f.namespace['hs'] = hs
reactor.listenTCP(config.manhole, f, interface='127.0.0.1')
hs.start_listening(config.bind_port, config.unsecure_port)
bind_port = config.bind_port
if config.no_tls:
bind_port = None
hs.start_listening(bind_port, config.unsecure_port)
if config.daemonize:
print config.pid_file