Messing around in situ

Author: MadLittleMods

synapse/http/client.py

@@ -412,7 +412,7 @@ async def request(
                 if data is not None:
                     body_producer = QuieterFileBodyProducer(
                         BytesIO(data),
-                        cooperator=self._cooperator,
+                        # cooperator=self._cooperator,
                     )
 
                 # Always make sure we add a user agent to the request
@@ -438,7 +438,7 @@ async def request(
                 # for https://twistedmatrix.com/trac/ticket/9534.
                 request_deferred = timeout_deferred(
                     deferred=request_deferred,
-                    timeout=60,
+                    timeout=2,
                     clock=self.hs.get_clock(),
                 )
 

synapse/rest/client/versions.py

@@ -47,6 +47,7 @@ def __init__(self, hs: "HomeServer"):
         self.config = hs.config
         self.auth = hs.get_auth()
         self.store = hs.get_datastores().main
+        self.http_client = hs.get_proxied_blocklisted_http_client()
 
         # Calculate these once since they shouldn't change after start-up.
         self.e2ee_forced_public = (
@@ -63,6 +64,33 @@ def __init__(self, hs: "HomeServer"):
         )
 
     async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
+        logger.info("asdf before test")
+        try:
+            from twisted.internet import defer
+
+            async def _catch_errors(task: defer.Deferred, url: str):
+                try:
+                    await task
+                except Exception:
+                    logger.exception("Error in async callback (POST %s)", url)
+
+            stub_url = "http://localhost:3000/post"
+            await self.http_client.post_json_get_json(
+                uri=stub_url, post_json="{}", headers=None
+            )
+            # task = self.http_client.post_json_get_json(
+            #     uri=stub_url, post_json="{}", headers=None
+            # )
+            # await task
+            # if False:
+            #     defer.ensureDeferred(_catch_errors(task, stub_url))
+            # else:
+            #     await task
+        except Exception as exc:
+            logger.exception("asdf exception during test: %s", exc)
+        finally:
+            logger.info("asdf after test")
+
         msc3881_enabled = self.config.experimental.msc3881_enabled
         msc3575_enabled = self.config.experimental.msc3575_enabled
 

tests/test_utils/logging_setup.py

@@ -59,6 +59,9 @@ def setup_logging() -> None:
     log_level = os.environ.get("SYNAPSE_TEST_LOG_LEVEL", "ERROR")
     root_logger.setLevel(log_level)
 
+    # TODO: Remove
+    logging.getLogger("synapse.logging.context.debug").setLevel(logging.DEBUG)
+
     # In order to not add noise by default (since we only log ERROR messages for trial
     # tests as configured above), we only enable this for developers for looking for
     # more INFO or DEBUG.