Merge branch 'main' into support/3.2

zatosource · Oct 6, 2023 · c415788 · c415788
2 parents cc24dd6 + eb62dc5
commit c415788
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/code/zato-server/src/zato/server/base/parallel/__init__.py b/code/zato-server/src/zato/server/base/parallel/__init__.py
@@ -520,9 +520,15 @@ def _add_pickup_conf_from_local_path(self, paths:'str', source:'str') -> 'None':
             # .. add  the actual configuration ..
             for path in paths:
 
+                # .. make sure the path is actually given on input, e.g. it is not None or '' ..
+                if not path:
+                    msg = f'Ignoring empty hot-deployment configuration path `{path}` (source -> {source})'
+                    logger.info(msg)
+                    continue
+
                 # .. log what we are about to do ..
-                msg = 'Adding hot-deployment configuration from `%s` (source -> %s)'
-                logger.info(msg, path, source)
+                msg = f'Adding hot-deployment configuration from `{path}` (source -> {source})'
+                logger.info(msg)
 
                 # .. stay on the safe side because, here, we do not know where it will be used ..
                 _fs_safe_name = fs_safe_name(path)
@@ -539,12 +545,8 @@ def _add_pickup_conf_from_local_path(self, paths:'str', source:'str') -> 'None':
                 # .. go through any of the paths potentially containing user configuration directories ..
                 for user_conf_path in Path(path).rglob(HotDeploy.User_Conf_Directory):
 
-                    # .. make sure that this directory exists ..
-                    if not os.path.exists(user_conf_path):
-                        logger.info(f'Ignoring nonexistent pickup directory -> {user_conf_path}')
-                    else:
-                        # .. and add each of them to hot-deployment.
-                        self._add_user_conf_from_path(str(user_conf_path))
+                    # .. and add each of them to hot-deployment.
+                    self._add_user_conf_from_path(str(user_conf_path))
 
 # ################################################################################################################################