diff options
Diffstat (limited to 'base/deploy/src/pkispawn')
| -rwxr-xr-x | base/deploy/src/pkispawn | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn index 4ea678ef6..f0543ce4d 100755 --- a/base/deploy/src/pkispawn +++ b/base/deploy/src/pkispawn @@ -102,30 +102,17 @@ def main(argv): # Enable 'pkispawn' logging. rv = 0 - if not config.pki_update_flag: - config.pki_log_dir = config.pki_root_prefix +\ - config.PKI_DEPLOYMENT_LOG_ROOT - config.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, - "pkispawn") - else: - config.pki_log_dir = config.pki_root_prefix +\ - config.PKI_DEPLOYMENT_LOG_ROOT - config.pki_log_name = "pki" + "-" +\ - config.pki_subsystem.lower() +\ - "-" + "respawn" + "." +\ - 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, - "pkirespawn") + config.pki_log_dir = config.pki_root_prefix +\ + config.PKI_DEPLOYMENT_LOG_ROOT + config.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, + "pkispawn") if rv != OSError: config.pki_log = rv else: @@ -176,12 +163,8 @@ def main(argv): # Combine the various sectional dictionaries into a PKI master dictionary parse.compose_pki_master_dictionary() - if not config.pki_update_flag: - config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\ - config.pki_log_name - else: - config.pki_master_dict['pki_respawn_log'] = config.pki_log_dir + "/" +\ - config.pki_log_name + config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\ + config.pki_log_name config.pki_log.debug(log.PKI_DICTIONARY_MASTER, extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.debug(pp.pformat(config.pki_master_dict), @@ -206,10 +189,7 @@ def main(argv): "." + pki_scriptlet[4:], fromlist = [pki_scriptlet[4:]]) instance = scriptlet.PkiScriptlet() - if not config.pki_update_flag: - rv = instance.spawn() - else: - rv = instance.respawn() + rv = instance.spawn() if rv != 0: sys.exit(1) config.pki_log.debug(log.PKI_DICTIONARY_MASTER, |