diff options
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
| -rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index 2cc3ad203..f11e2ed73 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -25,6 +25,7 @@ from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master import pkihelper as util import pkimanifest as manifest +import pkilogging import pkimessages as log import pkiscriptlet @@ -35,17 +36,17 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if config.str2bool(master['pki_skip_installation']): - config.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__, + pkilogging.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - config.pki_log.info(log.FINALIZATION_SPAWN_1, __name__, + pkilogging.pki_log.info(log.FINALIZATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # For debugging/auditing purposes, save a timestamped copy of # this configuration file in the subsystem archive util.file.copy(master['pki_deployment_cfg_replica'], master['pki_deployment_cfg_spawn_archive']) # Save a copy of the installation manifest file - config.pki_log.info(log.PKI_MANIFEST_MESSAGE_1, master['pki_manifest'], + pkilogging.pki_log.info(log.PKI_MANIFEST_MESSAGE_1, master['pki_manifest'], extra=PKIConfig.PKI_INDENTATION_LEVEL_2) # for record in manifest.database: # print tuple(record) @@ -75,7 +76,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): if config.str2bool(master['pki_skip_configuration']): util.configuration_file.log_configuration_url() # Log final process messages - config.pki_log.info(log.PKISPAWN_END_MESSAGE_2, + pkilogging.pki_log.info(log.PKISPAWN_END_MESSAGE_2, master['pki_subsystem'], master['pki_instance_id'], extra=PKIConfig.PKI_INDENTATION_LEVEL_0) @@ -87,7 +88,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv def destroy(self): - config.pki_log.info(log.FINALIZATION_DESTROY_1, __name__, + pkilogging.pki_log.info(log.FINALIZATION_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) util.file.modify(master['pki_destroy_log'], silent=True) # Start this Apache/Tomcat PKI Process @@ -97,7 +98,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): elif master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS and\ util.instance.tomcat_instance_subsystems() >= 1: util.systemd.start() - config.pki_log.info(log.PKIDESTROY_END_MESSAGE_2, + pkilogging.pki_log.info(log.PKIDESTROY_END_MESSAGE_2, master['pki_subsystem'], master['pki_instance_id'], extra=PKIConfig.PKI_INDENTATION_LEVEL_0) |