From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 17 Oct 2012 23:12:50 +0000 (-0700)
Subject: [2205] logged really unexpected exception in manager's dtor.
X-Git-Tag: trac2402_base~15^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5afffd2e3db401cafb5ac2ca80215afffddf7da;p=thirdparty%2Fkea.git

[2205] logged really unexpected exception in manager's dtor.
---

diff --git a/src/bin/auth/auth_messages.mes b/src/bin/auth/auth_messages.mes
index f5253e6959..e8cb2885f2 100644
--- a/src/bin/auth/auth_messages.mes
+++ b/src/bin/auth/auth_messages.mes
@@ -301,3 +301,11 @@ AUTH_DATASRC_CLIENTS_BUILDER_FAILED or
 AUTH_DATASRC_CLIENTS_BUILDER_FAILED_UNEXPECTED error messages in past
 logs.  If this message appears, the maintenance of the data source
 clients hasn't been working properly for some time.
+
+% AUTH_DATASRC_CLIENTS_SHUTDOWN_UNEXPECTED_ERROR Unexpected error on waiting for data source builder thread
+Some exception happens while waiting for the termination of the
+separate thread for maintaining data source clients.  This shouldn't
+happen in normal conditions; it should be either fatal system level
+errors such as severe memory shortage or some internal bug.  If that
+happens, and if it's not in the middle of terminating b10-auth, it's
+probably better to stop and restart it.
diff --git a/src/bin/auth/datasrc_clients_mgr.h b/src/bin/auth/datasrc_clients_mgr.h
index 073e2ccbda..7389a6b222 100644
--- a/src/bin/auth/datasrc_clients_mgr.h
+++ b/src/bin/auth/datasrc_clients_mgr.h
@@ -128,7 +128,10 @@ public:
             // simply let it go through.
             LOG_ERROR(auth_logger, AUTH_DATASRC_CLIENTS_SHUTDOWN_ERROR).
                 arg(ex.what());
-        } catch (...) {}
+        } catch (...) {
+            LOG_ERROR(auth_logger,
+                      AUTH_DATASRC_CLIENTS_SHUTDOWN_UNEXPECTED_ERROR);
+        }
 
         cleanup();              // see below
     }