From fd33663b223d93ee16e43eb6b386b822d8346ba8 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 14 Jan 2025 11:54:57 +0100
Subject: [PATCH] Add `verbose` option to `backend_factory` (useful to avoid
 useless log output when used in short-lived CLI commands)

---
 server/parsec/backend.py                | 7 ++++---
 server/parsec/cli/run.py                | 2 +-
 server/parsec/cli/testbed.py            | 2 +-
 server/tests/common/backend.py          | 2 +-
 server/tests/test_cross_server_event.py | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/parsec/backend.py b/server/parsec/backend.py
index e2396e06705..c5fbfe24b49 100644
--- a/server/parsec/backend.py
+++ b/server/parsec/backend.py
@@ -61,10 +61,11 @@
 
 
 @asynccontextmanager
-async def backend_factory(config: BackendConfig) -> AsyncGenerator[Backend, None]:
+async def backend_factory(config: BackendConfig, verbose: bool) -> AsyncGenerator[Backend, None]:
     # Log the server version and the backend configuration
-    logger.info("Parsec version", version=server_version)
-    logger.info("Backend configuration", **config.logging_kwargs())
+    if verbose:
+        logger.info("Parsec version", version=server_version)
+        logger.info("Backend configuration", **config.logging_kwargs())
 
     if config.db_config.is_mocked():
         components_factory = mocked_components_factory
diff --git a/server/parsec/cli/run.py b/server/parsec/cli/run.py
index ab17feffe72..ec009e8d27a 100644
--- a/server/parsec/cli/run.py
+++ b/server/parsec/cli/run.py
@@ -480,7 +480,7 @@ async def _run_backend(
             retry_policy.new_attempt()
 
             # Run the backend app (and connect to the database)
-            async with backend_factory(config=app_config) as backend:
+            async with backend_factory(config=app_config, verbose=True) as backend:
                 # Connection is successful, reset the retry policy
                 retry_policy.success()
 
diff --git a/server/parsec/cli/testbed.py b/server/parsec/cli/testbed.py
index fd940f169ee..7070f0332df 100644
--- a/server/parsec/cli/testbed.py
+++ b/server/parsec/cli/testbed.py
@@ -247,7 +247,7 @@ async def testbed_backend_factory(
         administration_token="s3cr3t",
         organization_spontaneous_bootstrap=True,
     )
-    async with backend_factory(config=config) as backend:
+    async with backend_factory(config=config, verbose=True) as backend:
         yield TestbedBackend(backend=backend)
 
 
diff --git a/server/tests/common/backend.py b/server/tests/common/backend.py
index fa65f0c07e6..3a55b5f78de 100644
--- a/server/tests/common/backend.py
+++ b/server/tests/common/backend.py
@@ -65,7 +65,7 @@ async def backend(
 
     async def _run_backend():
         nonlocal backend
-        async with backend_factory(config=backend_config) as backend:
+        async with backend_factory(config=backend_config, verbose=False) as backend:
             started.set()
             try:
                 await should_stop.wait()
diff --git a/server/tests/test_cross_server_event.py b/server/tests/test_cross_server_event.py
index bdbe6012895..372c660f993 100644
--- a/server/tests/test_cross_server_event.py
+++ b/server/tests/test_cross_server_event.py
@@ -13,8 +13,8 @@
 @pytest.mark.postgresql
 async def test_cross_server_event(backend_config: BackendConfig) -> None:
     async with (
-        backend_factory(config=backend_config) as b1,
-        backend_factory(config=backend_config) as b2,
+        backend_factory(config=backend_config, verbose=False) as b1,
+        backend_factory(config=backend_config, verbose=False) as b2,
     ):
         b2_received_events = Queue()