diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-10 16:07:44 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-10 16:07:44 +0100 |
| commit | 6c1f0055dc18038deb133ffad7718705e298c146 (patch) | |
| tree | 1693e1339d030ac6ee7f3e8955aa1d5bd9e36567 /synapse/app | |
| parent | Move database preparing code out of homserver.py into storage where it belongs (diff) | |
| download | synapse-6c1f0055dc18038deb133ffad7718705e298c146.tar.xz | |
No need for a tiny run() function any more, just use reactor.run() directly
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b63ecd4b5f..e9a6321020 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -173,10 +173,6 @@ class SynapseHomeServer(HomeServer): logger.info("Synapse now listening on port %d", unsecure_port) -def run(): - reactor.run() - - def setup(): config = HomeServerConfig.load_config( "Synapse Homeserver", @@ -229,7 +225,7 @@ def setup(): daemon = Daemonize( app="synapse-homeserver", pid=config.pid_file, - action=run, + action=reactor.run, auto_close_fds=False, verbose=True, logger=logger, @@ -237,7 +233,7 @@ def setup(): daemon.start() else: - run() + reactor.run() if __name__ == '__main__': |