From b80b93ea0f47f9854bc093c72f4f0bd42898fabe Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 26 Apr 2016 15:57:28 +0100
Subject: Add a log context to the daemonized pusher

---
 synapse/app/pusher.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index 5f3200cf4c..a67650b5d1 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -296,10 +296,15 @@ if __name__ == '__main__':
         ps = setup(sys.argv[1:])
 
         if ps.config.daemonize:
+            def run():
+                with LoggingContext("run"):
+                    change_resource_limit(ps.config.soft_file_limit)
+                    reactor.run()
+
             daemon = Daemonize(
                 app="synapse-pusher",
                 pid=ps.config.pid_file,
-                action=reactor.run,
+                action=run,
                 auto_close_fds=False,
                 verbose=True,
                 logger=logger,
-- 
cgit 1.4.1