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

Patch attached.

--
Martin Basti

From bfb0788c170238a4e1326c4859246099b591dcb8 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Mon, 11 May 2015 14:04:29 +0200
Subject: [PATCH] DNSSEC: fix traceback during shutdown phase

ipa-dnskeysyncd causes traceback when receive SIGTERM, SIGINT

Ticket: https://fedorahosted.org/freeipa/ticket/4657
---
 daemons/dnssec/ipa-dnskeysyncd | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/daemons/dnssec/ipa-dnskeysyncd b/daemons/dnssec/ipa-dnskeysyncd
index 398f0076290c0d4bea48d15714505d46cd5ef5d4..31027cb0ce10496c17a6c4b500525d2e5b8b2e93 100755
--- a/daemons/dnssec/ipa-dnskeysyncd
+++ b/daemons/dnssec/ipa-dnskeysyncd
@@ -22,6 +22,17 @@ from ipaplatform.paths import paths
 
 from ipapython.dnssec.keysyncer import KeySyncer
 
+# IPA framework initialization
+api.bootstrap(in_server=True, log=None)  # no logging to file
+api.finalize()
+standard_logging_setup(verbose=True, debug=api.env.debug)
+log = root_logger
+#log.addHandler(systemd.journal.JournalHandler())
+
+# Global state
+watcher_running = True
+ldap_connection = False
+
 DAEMONNAME = 'ipa-dnskeysyncd'
 PRINCIPAL = None  # not initialized yet
 WORKDIR = '/tmp' # private temp
@@ -47,21 +58,10 @@ def commenceShutdown(signum, stack):
 
 os.umask(007)
 
-# Global state
-watcher_running = True
-ldap_connection = False
-
 # Signal handlers
 signal.signal(signal.SIGTERM, commenceShutdown)
 signal.signal(signal.SIGINT, commenceShutdown)
 
-# IPA framework initialization
-api.bootstrap(in_server=True, log=None)  # no logging to file
-api.finalize()
-standard_logging_setup(verbose=True, debug=api.env.debug)
-log = root_logger
-#log.addHandler(systemd.journal.JournalHandler())
-
 # Kerberos initialization
 PRINCIPAL = str('%s/%s' % (DAEMONNAME, api.env.host))
 log.debug('Kerberos principal: %s', PRINCIPAL)
-- 
2.1.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to