Refactored deployment timestamp variables.

To improve reusability the deployment timestamp variables have been
converted from global variables in pkiconfig.py into attributes in
PKIDeployer.

5 files changed, 15 insertions, 31 deletions

diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py
index 2e95d2bf1..b5db8867a 100644
--- a/base/server/python/pki/server/deployment/__init__.py
+++ b/base/server/python/pki/server/deployment/__init__.py
@@ -20,6 +20,8 @@
 
 from __future__ import absolute_import
 import os
+import time
+from time import strftime as date
 from lxml import etree
 
 from . import pkiconfig as config
@@ -61,6 +63,14 @@ class PKIDeployer:
         self.tps_connector = None
         self.config_client = None
 
+        # Set installation time
+        ticks = time.time()
+        self.install_time = time.asctime(time.localtime(ticks))
+
+        # Generate a timestamp
+        self.log_timestamp = date('%Y%m%d%H%M%S', time.localtime(ticks))
+        self.certificate_timestamp = date('%Y-%m-%d %H:%M:%S', time.localtime(ticks))
+
     def init(self):
 
         # Utility objects
diff --git a/base/server/python/pki/server/deployment/pkiconfig.py b/base/server/python/pki/server/deployment/pkiconfig.py
index 5557562ce..8cf830c13 100644
--- a/base/server/python/pki/server/deployment/pkiconfig.py
+++ b/base/server/python/pki/server/deployment/pkiconfig.py
@@ -94,12 +94,9 @@ PKI_DEPLOYMENT_DEFAULT_TOMCAT_SERVER_PORT = 8005
 PKI_DEPLOYMENT_DEFAULT_TOMCAT_AJP_PORT = 8009
 
 # PKI Deployment Global Variables
-pki_install_time = None
-pki_timestamp = None
 pki_architecture = None
 pki_hostname = None
 pki_dns_domainname = None
-pki_certificate_timestamp = None
 
 
 # PKI Deployment Command-Line Variables
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 2b7c77f2a..14a1a1e0d 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -571,10 +571,9 @@ class PKIConfigParser:
             # 'pkispawn'/'pkidestroy' name/value pairs
             self.mdict['pki_deployment_executable'] = \
                 config.pki_deployment_executable
-            self.mdict['pki_install_time'] = config.pki_install_time
-            self.mdict['pki_timestamp'] = config.pki_timestamp
-            self.mdict['pki_certificate_timestamp'] = \
-                config.pki_certificate_timestamp
+            self.mdict['pki_install_time'] = self.deployer.install_time
+            self.mdict['pki_timestamp'] = self.deployer.log_timestamp
+            self.mdict['pki_certificate_timestamp'] = self.deployer.certificate_timestamp
             self.mdict['pki_architecture'] = config.pki_architecture
             self.mdict['pki_default_deployment_cfg'] = \
                 config.default_deployment_cfg
diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy
index ca16bb2e7..de7db951d 100755
--- a/base/server/sbin/pkidestroy
+++ b/base/server/sbin/pkidestroy
@@ -34,9 +34,7 @@ try:
     import socket
     import struct
     import subprocess
-    import time
     import traceback
-    from time import strftime as date
     import pki
     from pki.server.deployment import pkiconfig as config
     from pki.server.deployment.pkiparser import PKIConfigParser
@@ -72,15 +70,6 @@ def main(argv):
     # Set the umask
     os.umask(config.PKI_DEPLOYMENT_DEFAULT_UMASK)
 
-    # Set installation time
-    ticks = time.time()
-    config.pki_install_time = time.asctime(time.localtime(ticks))
-
-    # Generate a timestamp
-    config.pki_timestamp = date('%Y%m%d%H%M%S', time.localtime(ticks))
-    config.pki_certificate_timestamp =\
-        date('%Y-%m-%d %H:%M:%S', time.localtime(ticks))
-
     # Obtain the architecture bit-size
     config.pki_architecture = struct.calcsize("P") * 8
 
@@ -225,7 +214,7 @@ def main(argv):
     config.pki_log_name = "pki" + "-" +\
                           deployer.subsystem_name.lower() +\
                           "-" + "destroy" + "." +\
-                          config.pki_timestamp + "." + "log"
+                          deployer.log_timestamp + "." + "log"
     print('Log file: %s/%s' % (config.pki_log_dir, config.pki_log_name))
 
     rv = pkilogging.enable_pki_logger(config.pki_log_dir,
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index 1ffa435ab..09b447417 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -36,9 +36,7 @@ try:
     import socket
     import struct
     import subprocess
-    import time
     import traceback
-    from time import strftime as date
     import pki
     from pki.server.deployment import pkiconfig as config
     from pki.server.deployment import pkimanifest as manifest
@@ -75,15 +73,6 @@ def main(argv):
     # Set the umask
     os.umask(config.PKI_DEPLOYMENT_DEFAULT_UMASK)
 
-    # Set installation time
-    ticks = time.time()
-    config.pki_install_time = time.asctime(time.localtime(ticks))
-
-    # Generate a timestamp
-    config.pki_timestamp = date('%Y%m%d%H%M%S', time.localtime(ticks))
-    config.pki_certificate_timestamp = \
-        date('%Y-%m-%d %H:%M:%S', time.localtime(ticks))
-
     # Obtain the architecture bit-size
     config.pki_architecture = struct.calcsize("P") * 8
 
@@ -613,7 +602,7 @@ def start_logging():
     config.pki_log_name = "pki" + "-" + \
                           deployer.subsystem_name.lower() + \
                           "-" + "spawn" + "." + \
-                          config.pki_timestamp + "." + "log"
+                          deployer.log_timestamp + "." + "log"
     print('Log file: %s/%s' % (config.pki_log_dir, config.pki_log_name))
     rv = pkilogging.enable_pki_logger(config.pki_log_dir,
                                       config.pki_log_name,