Add PKIServer.actual_logs_dir property

dogtagpki · Apr 25, 2024 · bc04be0 · bc04be0
1 parent aafadaf
commit bc04be0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
@@ -128,7 +128,7 @@ def __init__(self,
 
         # The standard logs dir at /var/lib/pki/<instance>/logs
         # will be an actual folder (i.e. not a link).
-        self.actual_logs_dir = None
+        self._logs_dir = None
 
         self.config = {}
         self.passwords = {}
@@ -186,6 +186,10 @@ def common_lib_dir(self):
     def logs_dir(self):
         return os.path.join(self.base_dir, 'logs')
 
+    @property
+    def actual_logs_dir(self):
+        return self._logs_dir if self._logs_dir else self.logs_dir
+
     @property
     def temp_dir(self):
         return os.path.join(self.base_dir, 'temp')
@@ -826,13 +830,13 @@ def create_conf_dir(self, exist_ok=False):
 
     def create_logs_dir(self, exist_ok=False):
 
-        if self.actual_logs_dir:
+        if self._logs_dir:
 
             # Create /var/log/pki/<instance>
-            self.makedirs(self.actual_logs_dir, exist_ok=exist_ok)
+            self.makedirs(self._logs_dir, exist_ok=exist_ok)
 
             # Link /var/lib/pki/<instance>/logs to /var/log/pki/<instance>
-            self.symlink(self.actual_logs_dir, self.logs_dir, exist_ok=exist_ok)
+            self.symlink(self._logs_dir, self.logs_dir, exist_ok=exist_ok)
 
             return
 
@@ -1256,15 +1260,15 @@ def remove_logs_dir(self, force=False):
         if os.path.islink(self.logs_dir):
 
             # Get the actual folder in case it has changed
-            actual_logs_dir = os.readlink(self.logs_dir)
+            _logs_dir = os.readlink(self.logs_dir)
 
             # Remove /var/lib/pki/<instance>/logs
             logger.info('Removing %s', self.logs_dir)
             pki.util.unlink(self.logs_dir, force=force)
 
             # Remove /var/log/pki/<instance>
-            logger.info('Removing %s', actual_logs_dir)
-            pki.util.rmtree(actual_logs_dir, force=force)
+            logger.info('Removing %s', _logs_dir)
+            pki.util.rmtree(_logs_dir, force=force)
 
             return
 

diff --git a/base/server/python/pki/server/instance.py b/base/server/python/pki/server/instance.py
@@ -73,7 +73,7 @@ def __init__(self,
 
         # The standard conf dir at /var/lib/pki/<instance>/logs
         # will be a link to the actual folder at /var/log/pki/<instance>.
-        self.actual_logs_dir = os.path.join(pki.server.PKIServer.LOG_DIR, self.name)
+        self._logs_dir = os.path.join(pki.server.PKIServer.LOG_DIR, self.name)
 
         self.default_root_doc_base = os.path.join(
             pki.SHARE_DIR,