Skip to content

Commit e0b1fb8

Browse files
committed
improve logging
Signed-off-by: Zen <[email protected]>
1 parent 42271bf commit e0b1fb8

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/ugrd/initramfs_dict.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ def _process_custom_parameters(self, parameter_name: str, parameter_type: type)
136136
case _: # For strings and things, don't init them so they are None
137137
self.logger.debug("Leaving '%s' as None" % parameter_name)
138138

139+
self._process_unprocessed(parameter_name)
140+
139141
def _process_unprocessed(self, parameter_name: str) -> None:
140142
""" Processes queued values for a parameter. """
141143
if parameter_name not in self['_processing']:
@@ -234,14 +236,16 @@ def _process_modules(self, module: str) -> None:
234236
except TOMLDecodeError as e:
235237
raise TOMLDecodeError("Unable to load module config: %s" % module) from e
236238

237-
processing_imports = ['imports', 'custom_parameters'] # Register custom_paramters, process improts first
238-
for import_type in processing_imports:
239-
if import_type in module_config:
240-
self[import_type] = module_config[import_type]
241-
self.logger.debug("[%s] Registered %s: %s" % (module, import_type, module_config[import_type]))
239+
if imports := module_config.get('imports'):
240+
self.logger.debug("[%s] Processing imports: %s" % (module, imports))
241+
self['imports'] = imports
242+
243+
if custom_parameters := module_config.get('custom_parameters'):
244+
self.logger.debug("[%s] Processing custom parameters: %s" % (module, custom_parameters))
245+
self['custom_parameters'] = custom_parameters
242246

243247
for name, value in module_config.items(): # Process config values, in order they are defined
244-
if name in processing_imports:
248+
if name in ['imports', 'custom_parameters']:
245249
self.logger.log(5, "[%s] Skipping '%s'" % (module, name))
246250
continue
247251
self.logger.debug("[%s] Setting '%s' to: %s" % (module, name, value))

0 commit comments

Comments
 (0)