diff options
| author | Abhishek Koneru <akoneru@redhat.com> | 2013-04-22 15:48:57 -0400 |
|---|---|---|
| committer | Abhishek Koneru <akoneru@redhat.com> | 2013-04-22 16:17:09 -0400 |
| commit | 991fdc49e17166a9c6003b73bf21172e59746141 (patch) | |
| tree | 40a7afabb13e9544c6ba8f00d21b40aff8e174bd | |
| parent | 40378f5a796227db137de932b143801cd17ad9e3 (diff) | |
| download | pki-991fdc49e17166a9c6003b73bf21172e59746141.tar.gz pki-991fdc49e17166a9c6003b73bf21172e59746141.tar.xz pki-991fdc49e17166a9c6003b73bf21172e59746141.zip | |
Remove installation information logs in pkispawn.
Do not log the installation information after completion of
installation in pkispawn because, when run in verbose mode,
All the information is printed twice in an unordered way.
| -rw-r--r-- | base/server/src/engine/pkimessages.py | 2 | ||||
| -rwxr-xr-x | base/server/src/pkispawn | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/base/server/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py index d5c14ec8e..8aee018d3 100644 --- a/base/server/src/engine/pkimessages.py +++ b/base/server/src/engine/pkimessages.py @@ -314,7 +314,7 @@ PKI_ACCESS_URL = "\tThe URL for the subsystem is https://%s:%s/%s" PKI_INSTANCE_RESTART_MESSAGE = "\tTo restart the subsystem: systemctl restart pki-tomcatd\@%s.service" PKI_SPAWN_INFORMATION_HEADER = "\n\t==========================================================================\n"\ - "\t INSTALLATION INFORMATION\n"\ + "\t INSTALLATION SUMMARY\n"\ "\t==========================================================================\n" PKI_SPAWN_INFORMATION_FOOTER = "\n\t==========================================================================\n" diff --git a/base/server/src/pkispawn b/base/server/src/pkispawn index eef38204f..fb0ff6687 100755 --- a/base/server/src/pkispawn +++ b/base/server/src/pkispawn @@ -381,35 +381,17 @@ def main(argv): print "Installation complete." print - def print_install_information(): - config.pki_log.info(log.PKI_SPAWN_INFORMATION_HEADER, extra=config.PKI_INDENTATION_LEVEL_0) - print log.PKI_SPAWN_INFORMATION_HEADER - config.pki_log.info("\tAdmin username: %s",config.pki_master_dict['pki_admin_uid'], extra=config.PKI_INDENTATION_LEVEL_0) + print log.PKI_SPAWN_INFORMATION_HEADER print "\tAdmin username: %s" % config.pki_master_dict['pki_admin_uid'] - - config.pki_log.info("\tLocation of client database: %s",config.pki_master_dict['pki_client_database_dir'], extra=config.PKI_INDENTATION_LEVEL_0) print "\tLocation of client database: %s" % config.pki_master_dict['pki_client_database_dir'] - - config.pki_log.info("Client certificate nickname: %s", config.pki_master_dict['pki_admin_nickname'], extra=config.PKI_INDENTATION_LEVEL_0) print "\tClient certificate nickname: %s" % config.pki_master_dict['pki_admin_nickname'] - - config.pki_log.info(log.PKI_CHECK_STATUS_MESSAGE, config.pki_master_dict['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) print log.PKI_CHECK_STATUS_MESSAGE % config.pki_master_dict['pki_instance_name'] - - config.pki_log.info(log.PKI_INSTANCE_RESTART_MESSAGE, config.pki_master_dict['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) print log.PKI_INSTANCE_RESTART_MESSAGE % config.pki_master_dict['pki_instance_name'] - - config.pki_log.info(log.PKI_ACCESS_URL, config.pki_master_dict['pki_hostname'], - config.pki_master_dict['pki_https_port'], - config.pki_subsystem.lower(), - extra=config.PKI_INDENTATION_LEVEL_0) print log.PKI_ACCESS_URL % (config.pki_master_dict['pki_hostname'], config.pki_master_dict['pki_https_port'], config.pki_subsystem.lower()) - - config.pki_log.info(log.PKI_SPAWN_INFORMATION_FOOTER, extra=config.PKI_INDENTATION_LEVEL_0) print log.PKI_SPAWN_INFORMATION_FOOTER # PKI Deployment Entry Point |