[IMP] queue_job: show db name in channel config logs

Author: guewen

queue_job/jobrunner/channels.py

@@ -1038,12 +1038,16 @@ def simple_configure(self, config_string):
         for config in ChannelManager.parse_simple_config(config_string):
             self.get_channel_from_config(config)
 
-    def configure(self, configs):
-        """Configure the channel manager from list of :class:`ChannelConfig`"""
+    def configure(self, configs, db_name=None):
+        """Configure the channel manager from list of :class:`ChannelConfig`
+
+        :param db_name: used to show the database name in the
+        logs when using per-database channels
+        """
         for config in configs:
-            self.get_channel_from_config(asdict(config))
+            self.get_channel_from_config(asdict(config), db_name=db_name)
 
-    def get_channel_from_config(self, config):
+    def get_channel_from_config(self, config, db_name=None):
         """Return a Channel object from a parsed configuration.
 
         If the channel does not exist it is created.
@@ -1055,7 +1059,10 @@ def get_channel_from_config(self, config):
         """
         channel = self.get_channel_by_name(config["name"], autocreate=True)
         channel.configure(config)
-        _logger.info("Configured channel: %s", channel)
+        if db_name:
+            _logger.info("Configured channel: %s (db: %s)", channel, db_name)
+        else:
+            _logger.info("Configured channel: %s", channel)
         return channel
 
     def get_channel_by_name(

queue_job/jobrunner/runner.py

@@ -572,14 +572,16 @@ def _unique_channel_managers(channel_managers):
         return result
 
     @staticmethod
-    def _create_paused_root_channel_manager():
+    def _create_paused_root_channel_manager(db_name=None):
         """Create a channel manager with a single root and paused channel
 
         It is used when the channels configuration cannot be used because
         of a misconfiguration or because a database schema is outdated.
         """
         channel_manager = ChannelManager()
-        channel_manager.configure([ChannelConfig(name="root", capacity=0, paused=True)])
+        channel_manager.configure(
+            [ChannelConfig(name="root", capacity=0, paused=True)], db_name=db_name
+        )
         return channel_manager
 
     def _build_channel_manager(self, db):
@@ -598,7 +600,7 @@ def _build_channel_manager(self, db):
             _logger.error(
                 "database %s schema is outdated, -u queue_job required", db.db_name
             )
-            return self._create_paused_root_channel_manager()
+            return self._create_paused_root_channel_manager(db_name=db.db_name)
 
         root_config = next(
             (config for config in channels_config if config.name == "root"), None
@@ -617,7 +619,7 @@ def _build_channel_manager(self, db):
 
         channel_manager = ChannelManager()
         try:
-            channel_manager.configure(channels_config)
+            channel_manager.configure(channels_config, db_name=db.db_name)
         except ValueError:
             # A bad channel configuration on a single database
             # (e.g. sequential with a capacity != 1) should not
@@ -629,7 +631,7 @@ def _build_channel_manager(self, db):
                 db.db_name,
                 exc_info=True,
             )
-            return self._create_paused_root_channel_manager()
+            return self._create_paused_root_channel_manager(db_name=db.db_name)
         return channel_manager
 
     def _reconfigure_db(self, db_name):