improve logging

Signed-off-by: Zen <[email protected]>

Author: desultory

src/ugrd/base/core.py

@@ -1,18 +1,17 @@
 __author__ = 'desultory'
-__version__ = '3.0.2'
+__version__ = '3.1.0'
 
 from pathlib import Path
 from typing import Union
 
+from zenlib.util import check_dict
 
+
+@check_dict('clean', value=True, log_level=30, message="Skipping cleaning build directory")
 def clean_build_dir(self) -> None:
     """ Cleans the build directory. """
     from shutil import rmtree
 
-    if not self.clean:
-        self.logger.info("Skipping cleaning build directory")
-        return
-
     if self.build_dir.is_dir():
         self.logger.warning("Cleaning build directory: %s" % self.build_dir)
         rmtree(self.build_dir)
@@ -120,12 +119,9 @@ def deploy_symlinks(self) -> None:
         self._symlink(symlink_parameters['source'], symlink_parameters['target'])
 
 
+@check_dict('mknod_cpio', value=False, log_level=20, message="Skipping real device node creation with mknod, as mknod_cpio is specified.")
 def deploy_nodes(self) -> None:
     """ Generates specified device nodes. """
-    if self.get('mknod_cpio'):
-        self.logger.info("Skipping mknod generation, as mknod_cpio is specified")
-        return
-
     from os import makedev, mknod
     from stat import S_IFCHR
 

src/ugrd/kmod/kmod.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 from pathlib import Path
 from subprocess import run
@@ -253,7 +253,10 @@ def process_modules(self) -> None:
 @check_dict('kmod_init', not_empty=True, message="No kernel modules to load", log_level=30)
 def load_modules(self) -> None:
     """ Creates a bash script which loads all kernel modules in kmod_init. """
-    self.logger.info("Init kernel modules: %s" % self['kmod_init'])
-    self.logger.warning("Ignored kernel modules: %s" % self['_kmod_removed'])
+    self.logger.info("Init kernel modules: %s" % ', '.join(self['kmod_init']))
+    if included_kmods := list(set(self['kernel_modules']) ^ set(self['kmod_init'])):
+        self.logger.info("Included kernel modules: %s" % ', '.join(included_kmods))
+    if removed_kmods := self.get('_kmod_removed'):
+        self.logger.warning("Ignored kernel modules: %s" % ', '.join(removed_kmods))
     return f"modprobe -av {' '.join(self['kmod_init'])}"