From 65bbd0047143141b8d2d031dcf452aaeded8e8cf 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/configuration.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/deploy/src/scriptlets/configuration.py') diff --git a/base/deploy/src/scriptlets/configuration.py b/base/deploy/src/scriptlets/configuration.py index 44d017d72..07914b970 100644 --- a/base/deploy/src/scriptlets/configuration.py +++ b/base/deploy/src/scriptlets/configuration.py @@ -25,6 +25,7 @@ from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master from pkiconfig import pki_sensitive_dict as sensitive import pkihelper as util +import pkilogging import pkimessages as log import pkiscriptlet @@ -35,10 +36,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if config.str2bool(master['pki_skip_configuration']): - config.pki_log.info(log.SKIP_CONFIGURATION_SPAWN_1, __name__, + pkilogging.pki_log.info(log.SKIP_CONFIGURATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - config.pki_log.info(log.CONFIGURATION_SPAWN_1, __name__, + pkilogging.pki_log.info(log.CONFIGURATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # Place "slightly" less restrictive permissions on @@ -98,7 +99,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv def destroy(self): - config.pki_log.info(log.CONFIGURATION_DESTROY_1, __name__, + pkilogging.pki_log.info(log.CONFIGURATION_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) if master['pki_subsystem'] in PKIConfig.PKI_APACHE_SUBSYSTEMS and\ util.instance.apache_instance_subsystems() == 1: -- cgit