From afc1e1c37095faed52f0a6166547da27d93d2326 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 13 Nov 2012 23:00:07 -0500 Subject: Refactored log variables in pkiconfig.py. The log variables in pkiconfig.py have been moved into pkilogging.py for better clarity. Ticket #380 --- base/deploy/src/scriptlets/webapp_deployment.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/deploy/src/scriptlets/webapp_deployment.py') diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 6c7672a22..3f487be58 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -28,6 +28,7 @@ import pkiconfig as config from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master import pkihelper as util +import pkilogging import pkimessages as log import pkiscriptlet @@ -39,11 +40,11 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: if config.str2bool(master['pki_skip_installation']): - config.pki_log.info(log.SKIP_WEBAPP_DEPLOYMENT_SPAWN_1, + pkilogging.pki_log.info(log.SKIP_WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, + pkilogging.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # Copy /usr/share/pki/server/webapps/ROOT @@ -145,7 +146,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def destroy(self): if master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: - config.pki_log.info(log.WEBAPP_DEPLOYMENT_DESTROY_1, __name__, + pkilogging.pki_log.info(log.WEBAPP_DEPLOYMENT_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) util.directory.delete(master['pki_tomcat_webapps_subsystem_path']) return self.rv -- cgit