diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 85284a4919..855fe8e170 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -26,7 +26,7 @@ from twisted.web.server import Site
from synapse.http.server import JsonResource, RootRedirect
from synapse.http.content_repository import ContentRepoResource
from synapse.http.server_key_resource import LocalKey
-from synapse.http.client import MatrixHttpClient
+from synapse.http.matrixfederationclient import MatrixFederationHttpClient
from synapse.api.urls import (
CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,
SERVER_KEY_PREFIX,
@@ -51,7 +51,7 @@ logger = logging.getLogger(__name__)
class SynapseHomeServer(HomeServer):
def build_http_client(self):
- return MatrixHttpClient(self)
+ return MatrixFederationHttpClient(self)
def build_resource_for_client(self):
return JsonResource()
@@ -116,7 +116,7 @@ class SynapseHomeServer(HomeServer):
# extra resources to existing nodes. See self._resource_id for the key.
resource_mappings = {}
for (full_path, resource) in desired_tree:
- logging.info("Attaching %s to path %s", resource, full_path)
+ logger.info("Attaching %s to path %s", resource, full_path)
last_resource = self.root_resource
for path_seg in full_path.split('/')[1:-1]:
if not path_seg in last_resource.listNames():
@@ -221,12 +221,12 @@ def setup():
db_name = hs.get_db_name()
- logging.info("Preparing database: %s...", db_name)
+ logger.info("Preparing database: %s...", db_name)
with sqlite3.connect(db_name) as db_conn:
prepare_database(db_conn)
- logging.info("Database prepared in %s.", db_name)
+ logger.info("Database prepared in %s.", db_name)
hs.get_db_pool()
@@ -257,13 +257,16 @@ def setup():
else:
reactor.run()
+
def run():
with LoggingContext("run"):
reactor.run()
+
def main():
with LoggingContext("main"):
setup()
+
if __name__ == '__main__':
main()
|
