Fixes openwallet-foundation#3202: new suppress banner and replace pri…

…nt by logging statements Signed-off-by: Ricky Ng-Adam <ricky.ng-adam-ext@mcn.gouv.qc.ca>
didx-xyz · Jan 29, 2025 · 9471141 · 9471141
1 parent 78ac758
commit 9471141
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/acapy_agent/anoncreds/default/did_web/registry.py b/acapy_agent/anoncreds/default/did_web/registry.py
@@ -21,6 +21,8 @@
 
 LOGGER = logging.getLogger(__name__)
 
+LOGGER = logging.getLogger(__name__)
+
 
 class DIDWebRegistry(BaseAnonCredsResolver, BaseAnonCredsRegistrar):
     """DIDWebRegistry."""

diff --git a/acapy_agent/config/argparse.py b/acapy_agent/config/argparse.py
@@ -1013,6 +1013,13 @@ def add_arguments(self, parser: ArgumentParser):
                 "('debug', 'info', 'warning', 'error', 'critical')"
             ),
         )
+        parser.add_argument(
+            "--no-banner",
+            action="store_true",
+            env_var="ACAPY_NO_BANNER",
+            default=False,
+            help=("Suppress banner in logs"),
+        )
 
     def get_settings(self, args: Namespace) -> dict:
         """Extract logging settings."""
@@ -1023,6 +1030,7 @@ def get_settings(self, args: Namespace) -> dict:
             settings["log.file"] = args.log_file
         if args.log_level:
             settings["log.level"] = args.log_level
+        settings["log.banner"] = not args.no_banner
         return settings
 
 

diff --git a/acapy_agent/core/conductor.py b/acapy_agent/core/conductor.py
@@ -362,24 +362,25 @@ async def start(self) -> None:
         default_label = context.settings.get("default_label")
         LOGGER.debug("Agent label: %s", default_label)
 
-        if context.settings.get("transport.disabled"):
-            LoggingConfigurator.print_banner(
-                default_label,
-                None,
-                None,
-                self.setup_public_did and self.setup_public_did.did,
-                self.admin_server,
-            )
-        else:
-            LoggingConfigurator.print_banner(
-                default_label,
-                self.inbound_transport_manager.registered_transports,
-                self.outbound_transport_manager.registered_transports,
-                self.setup_public_did and self.setup_public_did.did,
-                self.admin_server,
-            )
+        if context.settings.get("log.banner", True):
+            if context.settings.get("transport.disabled"):
+                LoggingConfigurator.print_banner(
+                    default_label,
+                    None,
+                    None,
+                    self.setup_public_did and self.setup_public_did.did,
+                    self.admin_server,
+                )
+            else:
+                LoggingConfigurator.print_banner(
+                    default_label,
+                    self.inbound_transport_manager.registered_transports,
+                    self.outbound_transport_manager.registered_transports,
+                    self.setup_public_did and self.setup_public_did.did,
+                    self.admin_server,
+                )
 
-        LoggingConfigurator.print_notices(context.settings)
+            LoggingConfigurator.print_notices(context.settings)
 
         # record ACA-Py version in Wallet, if needed
         from_version_storage = None