diff options
Diffstat (limited to 'base/deploy/src/pkispawn')
| -rwxr-xr-x | base/deploy/src/pkispawn | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn index 63a827fcb..94909e7e6 100755 --- a/base/deploy/src/pkispawn +++ b/base/deploy/src/pkispawn @@ -104,72 +104,72 @@ def main(argv): # Enable 'pkispawn' logging. rv = 0 - config.pki_log_dir = config.pki_root_prefix +\ + pkilogging.pki_log_dir = config.pki_root_prefix +\ PKIConfig.PKI_DEPLOYMENT_LOG_ROOT - config.pki_log_name = "pki" + "-" +\ + pkilogging.pki_log_name = "pki" + "-" +\ config.pki_subsystem.lower() +\ "-" + "spawn" + "." +\ config.pki_timestamp + "." + "log" - rv = pkilogging.enable_pki_logger(config.pki_log_dir, - config.pki_log_name, - config.pki_log_level, - config.pki_console_log_level, + rv = pkilogging.enable_pki_logger(pkilogging.pki_log_dir, + pkilogging.pki_log_name, + pkilogging.pki_log_level, + pkilogging.pki_console_log_level, "pkispawn") if rv != OSError: - config.pki_log = rv + pkilogging.pki_log = rv else: - print log.PKI_UNABLE_TO_CREATE_LOG_DIRECTORY_1 % config.pki_log_dir + print log.PKI_UNABLE_TO_CREATE_LOG_DIRECTORY_1 % pkilogging.pki_log_dir sys.exit(1) # Read the specified PKI configuration file. rv = parser.read_pki_configuration_file() if rv != 0: - config.pki_log.error(PKI_UNABLE_TO_PARSE_1, rv, + pkilogging.pki_log.error(PKI_UNABLE_TO_PARSE_1, rv, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) sys.exit(1) else: # NEVER print out 'sensitive' name/value pairs!!! - config.pki_log.debug(log.PKI_DICTIONARY_COMMON, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_COMMON, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_common_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_common_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_web_server_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_web_server_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_subsystem_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_subsystem_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # NEVER print out 'sensitive' name/value pairs!!! - config.pki_log.debug(log.PKI_DICTIONARY_COMMON, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_COMMON, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_common_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_common_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_web_server_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_web_server_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_subsystem_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_subsystem_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # Read in the PKI slots configuration file. parser.compose_pki_slots_dictionary() - config.pki_log.debug(log.PKI_DICTIONARY_SLOTS, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_SLOTS, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_slots_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_slots_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # Combine the various sectional dictionaries into a PKI master dictionary parser.compose_pki_master_dictionary() - config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\ - config.pki_log_name - config.pki_log.debug(log.PKI_DICTIONARY_MASTER, + config.pki_master_dict['pki_spawn_log'] = pkilogging.pki_log_dir + "/" +\ + pkilogging.pki_log_name + pkilogging.pki_log.debug(log.PKI_DICTIONARY_MASTER, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_master_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_master_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # Install and configure the specified PKI subsystem. @@ -177,7 +177,7 @@ def main(argv): "/" + config.pki_subsystem.lower() if not os.path.exists(pki_scriptlets_path) or\ not os.path.isdir(pki_scriptlets_path): - config.pki_log.error(log.PKI_DIRECTORY_MISSING_OR_NOT_A_DIRECTORY_1, + pkilogging.pki_log.error(log.PKI_DIRECTORY_MISSING_OR_NOT_A_DIRECTORY_1, pki_scriptlets_path, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) sys.exit(1) @@ -194,9 +194,9 @@ def main(argv): rv = instance.spawn() if rv != 0: sys.exit(1) - config.pki_log.debug(log.PKI_DICTIONARY_MASTER, + pkilogging.pki_log.debug(log.PKI_DICTIONARY_MASTER, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - config.pki_log.debug(pp.pformat(config.pki_master_dict), + pkilogging.pki_log.debug(pp.pformat(config.pki_master_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) |