diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-12-22 04:25:01 +0100 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-12-22 05:37:57 +0100 |
commit | d77d308f2284ea057c5235d4e828ff4cd0029d57 (patch) | |
tree | f41b56d687861208ce71957b35ed50220ce78481 /base/server/python/pki/server | |
parent | 2fc929b2fbfefe8cc7c35fd20ee5d5e8b803b357 (diff) | |
download | pki-d77d308f2284ea057c5235d4e828ff4cd0029d57.tar.gz pki-d77d308f2284ea057c5235d4e828ff4cd0029d57.tar.xz pki-d77d308f2284ea057c5235d4e828ff4cd0029d57.zip |
Refactored deployment timestamp variables.
To improve reusability the deployment timestamp variables have been
converted from global variables in pkiconfig.py into attributes in
PKIDeployer.
Diffstat (limited to 'base/server/python/pki/server')
-rw-r--r-- | base/server/python/pki/server/deployment/__init__.py | 10 | ||||
-rw-r--r-- | base/server/python/pki/server/deployment/pkiconfig.py | 3 | ||||
-rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 7 |
3 files changed, 13 insertions, 7 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 |