diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
| commit | 53557fc53259631d71055ef2ab8a6916b00d229b (patch) | |
| tree | 208db19fb5bbcc5416e669bc496adc49acdcb1a7 /synapse/app | |
| parent | Fix bugs so lazy room joining works as intended. (diff) | |
| parent | Merge pull request #55 from matrix-org/profiling (diff) | |
| download | synapse-53557fc53259631d71055ef2ab8a6916b00d229b.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a9397de5b2..343ecea0fd 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -68,7 +68,7 @@ class SynapseHomeServer(HomeServer): return ClientV2AlphaRestResource(self) def build_resource_for_federation(self): - return JsonResource() + return JsonResource(self) def build_resource_for_app_services(self): return AppServiceRestResource(self) @@ -279,6 +279,8 @@ def setup(): hs.get_pusherpool().start() + hs.get_datastore().start_profiling() + if config.daemonize: print config.pid_file daemon = Daemonize( |