From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 9 Oct 2013 06:06:10 +0000 (+0530)
Subject: [3074] Add logging
X-Git-Tag: bind10-1.2.0beta1-release~102^2~52^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2115ed0befc5e58bc17960bfb89f5d209c2f9d71;p=thirdparty%2Fkea.git

[3074] Add logging
---

diff --git a/src/bin/bind10/init.py.in b/src/bin/bind10/init.py.in
index c16fca6548..608d43d2b4 100755
--- a/src/bin/bind10/init.py.in
+++ b/src/bin/bind10/init.py.in
@@ -765,9 +765,14 @@ class Init:
         it might want to choose if it is for this one).
         """
         logger.info(BIND10_STOP_PROCESS, process)
-        self.cc_session.group_sendmsg(isc.config.ccsession.
-                                      create_command('shutdown', {'pid': pid}),
-                                      recipient, recipient)
+        try:
+            self.cc_session.group_sendmsg(isc.config.ccsession.
+                                          create_command('shutdown',
+                                                         {'pid': pid}),
+                                          recipient, recipient)
+        except:
+            logger.error(BIND10_COMPONENT_SHUTDOWN_ERROR, process)
+            raise
 
     def component_shutdown(self, exitcode=0):
         """
diff --git a/src/bin/bind10/init_messages.mes b/src/bin/bind10/init_messages.mes
index 0719f6f261..21cd142dd8 100644
--- a/src/bin/bind10/init_messages.mes
+++ b/src/bin/bind10/init_messages.mes
@@ -329,3 +329,6 @@ ten seconds.
 % BIND10_RECONFIGURE_ERROR Error applying new config: %1
 A new configuration was received, but there was an error doing the
 re-configuration.
+
+% BIND10_COMPONENT_SHUTDOWN_ERROR An error occured stopping component %1
+An attempt to gracefully shutdown a component failed.