From: Francis Dupont <fdupont@isc.org>
Date: Tue, 28 Mar 2017 00:05:32 +0000 (+0200)
Subject: [master] Finished merge of trac2358a (DBGLVL_xxx)
X-Git-Tag: trac5196_base~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8e2ffa5a166af9b9533ce8cfe283d200693f405;p=thirdparty%2Fkea.git

[master] Finished merge of trac2358a (DBGLVL_xxx)
---

d8e2ffa5a166af9b9533ce8cfe283d200693f405
diff --cc src/bin/agent/ca_process.cc
index 085fe01d3f,99cb6769d2..1fa08731e7
--- a/src/bin/agent/ca_process.cc
+++ b/src/bin/agent/ca_process.cc
@@@ -107,17 -99,7 +107,17 @@@ CtrlAgentProcess::run() 
                    "Process run method failed: " << ex.what());
      }
  
 +    try {
 +        // Deregister commands.
 +        CtrlAgentControllerPtr controller =
 +            boost::dynamic_pointer_cast<CtrlAgentController>(
 +                CtrlAgentController::instance());
 +        controller->deregisterCommands();
 +    } catch (const std::exception&) {
 +        // What to do? Simply ignore...
 +    }
 +
-     LOG_DEBUG(agent_logger, DBGLVL_START_SHUT, CTRL_AGENT_RUN_EXIT);
+     LOG_DEBUG(agent_logger, isc::log::DBGLVL_START_SHUT, CTRL_AGENT_RUN_EXIT);
  }
  
  isc::data::ConstElementPtr
diff --cc src/lib/process/d_controller.cc
index ce26520926,51f7c7ee03..18f3b04842
--- a/src/lib/process/d_controller.cc
+++ b/src/lib/process/d_controller.cc
@@@ -500,10 -515,10 +503,10 @@@ DControllerBase::processSignal(int sign
          case SIGINT:
          case SIGTERM:
          {
-             LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT,
+             LOG_DEBUG(dctl_logger, isc::log::DBGLVL_START_SHUT,
                        DCTL_SHUTDOWN_SIGNAL_RECVD).arg(signum);
 -            isc::data::ElementPtr arg_set;
 -            executeCommand(SHUT_DOWN_COMMAND, arg_set);
 +            ElementPtr arg_set;
 +            shutdownHandler(SHUT_DOWN_COMMAND, arg_set);
              break;
          }