summary refs log tree commit diff
path: root/synapse/app/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-01 17:55:26 +0100
committerErik Johnston <erik@matrix.org>2019-07-02 17:12:48 +0100
commit9f3c0a8556a82960c795b8dc41a4666e0adebfef (patch)
tree0121a0e5ca3c1ccd414f4b3cba404de44ec21018 /synapse/app/_base.py
parentNewsfile (diff)
downloadsynapse-9f3c0a8556a82960c795b8dc41a4666e0adebfef.tar.xz
Add basic admin cmd app
Diffstat (limited to 'synapse/app/_base.py')
-rw-r--r--synapse/app/_base.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py
index d50a9840d4..200978a58f 100644
--- a/synapse/app/_base.py
+++ b/synapse/app/_base.py
@@ -48,7 +48,7 @@ def register_sighup(func):
     _sighup_callbacks.append(func)
 
 
-def start_worker_reactor(appname, config):
+def start_worker_reactor(appname, config, run_command=reactor.run):
     """ Run the reactor in the main process
 
     Daemonizes if necessary, and then configures some resources, before starting
@@ -57,6 +57,7 @@ def start_worker_reactor(appname, config):
     Args:
         appname (str): application name which will be sent to syslog
         config (synapse.config.Config): config object
+        run_command (Callable[]): callable that actually runs the reactor
     """
 
     logger = logging.getLogger(config.worker_app)
@@ -69,11 +70,19 @@ def start_worker_reactor(appname, config):
         daemonize=config.worker_daemonize,
         print_pidfile=config.print_pidfile,
         logger=logger,
+        run_command=run_command,
     )
 
 
 def start_reactor(
-    appname, soft_file_limit, gc_thresholds, pid_file, daemonize, print_pidfile, logger
+    appname,
+    soft_file_limit,
+    gc_thresholds,
+    pid_file,
+    daemonize,
+    print_pidfile,
+    logger,
+    run_command=reactor.run,
 ):
     """ Run the reactor in the main process
 
@@ -88,6 +97,7 @@ def start_reactor(
         daemonize (bool): true to run the reactor in a background process
         print_pidfile (bool): whether to print the pid file, if daemonize is True
         logger (logging.Logger): logger instance to pass to Daemonize
+        run_command (Callable[]): callable that actually runs the reactor
     """
 
     install_dns_limiter(reactor)
@@ -103,7 +113,8 @@ def start_reactor(
             change_resource_limit(soft_file_limit)
             if gc_thresholds:
                 gc.set_threshold(*gc_thresholds)
-            reactor.run()
+
+            run_command()
 
     if daemonize:
         if print_pidfile: