Merge commit '2f9fd5ab0' into anoa/dinsic_release_1_21_x

* commit '2f9fd5ab0': Don't log OPTIONS request at INFO (#8049)
matrix-org · Oct 19, 2020 · 5ede106 · 5ede106
2 parents a67a65a + 2f9fd5a
commit 5ede106
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/8049.misc b/changelog.d/8049.misc
@@ -0,0 +1 @@
+Log `OPTIONS` requests at `DEBUG` rather than `INFO` level to reduce amount logged at `INFO`.
diff --git a/synapse/http/site.py b/synapse/http/site.py
@@ -319,7 +319,13 @@ def _finished_processing(self):
     def _should_log_request(self) -> bool:
         """Whether we should log at INFO that we processed the request.
         """
-        return self.path != b"/health"
+        if self.path == b"/health":
+            return False
+
+        if self.method == b"OPTIONS":
+            return False
+
+        return True
 
 
 class XForwardedForRequest(SynapseRequest):