Fix a bug which meant that requests were logged with an invalid times…

…tamp (#86)
matrix-org · Mar 24, 2020 · 9b1a1dd · 9b1a1dd
1 parent 404b131
commit 9b1a1dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/changelog.d/86.bugfix b/changelog.d/86.bugfix
@@ -0,0 +1 @@
+Fix a bug which meant that requests were logged with an invalid timestamp.
diff --git a/sygnal/http.py b/sygnal/http.py
@@ -270,16 +270,18 @@ class SygnalLoggedSite(server.Site):
     Sygnal.
     """
 
-    def __init__(self, *args, reactor, log_formatter, **kwargs):
-        super().__init__(*args, reactor=reactor, **kwargs)
+    def __init__(self, *args, log_formatter, **kwargs):
+        super().__init__(*args, **kwargs)
         self.log_formatter = log_formatter
-        self.reactor = reactor
         self.logger = logging.getLogger("sygnal.access")
 
     def log(self, request):
-        log_date_time = datetimeToLogString(self.reactor.seconds())
+        """Log this request. Called by request.finish."""
+        # this also works around a bug in twisted.web.http.HTTPFactory which uses a
+        # monotonic time as an epoch time.
+        log_date_time = datetimeToLogString()
         line = self.log_formatter(log_date_time, request)
-        self.logger.info("%s", line)
+        self.logger.info("Handled request: %s", line)
 
 
 class PushGatewayApiServer(object):