Log unhandled exceptions in certificate renewal scripts.

https://fedorahosted.org/freeipa/ticket/4093

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

1 files changed, 20 insertions, 13 deletions

diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad
index c275eaee4..e58e04401 100644
--- a/install/restart_scripts/stop_pkicad
+++ b/install/restart_scripts/stop_pkicad
@@ -21,23 +21,30 @@
 
 import sys
 import syslog
+import traceback
 from ipapython import services as ipaservices
 from ipapython import dogtag
 from ipalib import api
 
-api.bootstrap(context='restart')
-api.finalize()
+def main():
+    api.bootstrap(context='restart')
+    api.finalize()
 
-configured_constants = dogtag.configured_constants(api)
-dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME]
-dogtag_instance = configured_constants.PKI_INSTANCE_NAME
+    configured_constants = dogtag.configured_constants(api)
+    dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME]
+    dogtag_instance = configured_constants.PKI_INSTANCE_NAME
+
+    syslog.syslog(syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name)
+    try:
+        dogtag_service.stop(dogtag_instance)
+    except Exception, e:
+        syslog.syslog(
+            syslog.LOG_ERR, "Cannot stop %s: %s" % (dogtag_service.service_name, e))
+    else:
+        syslog.syslog(
+            syslog.LOG_NOTICE, "Stopped %s" % dogtag_service.service_name)
 
-syslog.syslog(syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name)
 try:
-    dogtag_service.stop(dogtag_instance)
-except Exception, e:
-    syslog.syslog(
-        syslog.LOG_ERR, "Cannot stop %s: %s" % (dogtag_service.service_name, e))
-else:
-    syslog.syslog(
-        syslog.LOG_NOTICE, "Stopped %s" % dogtag_service.service_name)
+    main()
+except Exception:
+    syslog.syslog(syslog.LOG_ERR, traceback.format_exc())