[#728,!461] replaced hardcoded values and minor changes

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index c0b66ee14977d3b396a3b44f2773a14ea23bde9d..66a369b118c483561383d5b4245e1a68441de5c7 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -239,12 +239,7 @@ ControlledDhcpv4Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
         HookLibsCollection loaded = HooksManager::getLibraryInfo();
         HooksManager::prepareUnloadLibraries();
         static_cast<void>(HooksManager::unloadLibraries());
-        bool multi_threading_enabled = true;
-        uint32_t thread_count = 0;
-        uint32_t queue_size = 0;
-        CfgMultiThreading::extract(CfgMgr::instance().getStagingCfg()->getDHCPMultiThreading(),
-                                   multi_threading_enabled, thread_count, queue_size);
-        bool status = HooksManager::loadLibraries(loaded, multi_threading_enabled);
+        bool status = HooksManager::loadLibraries(loaded);
         if (!status) {
             isc_throw(Unexpected, "Failed to reload hooks libraries "
                                   "(WARNING: libreload is deprecated).");

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 717bf6678653eaac8c1f29e365f003500ccd7060..55c3046dbf37566e3e24d9f88ffac3a8ece22d73 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -242,12 +242,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
         HookLibsCollection loaded = HooksManager::getLibraryInfo();
         HooksManager::prepareUnloadLibraries();
         static_cast<void>(HooksManager::unloadLibraries());
-        bool multi_threading_enabled = true;
-        uint32_t thread_count = 0;
-        uint32_t queue_size = 0;
-        CfgMultiThreading::extract(CfgMgr::instance().getStagingCfg()->getDHCPMultiThreading(),
-                                   multi_threading_enabled, thread_count, queue_size);
-        bool status = HooksManager::loadLibraries(loaded, multi_threading_enabled);
+        bool status = HooksManager::loadLibraries(loaded);
         if (!status) {
             isc_throw(Unexpected, "Failed to reload hooks libraries"
                                   " (WARNING: libreload is deprecated).");

diff --git a/src/lib/stats/observation.cc b/src/lib/stats/observation.cc
index 2128f53a59b449e57a698dd6baf7798336c080dd..cd089258ba5f6a0e8e575e958da654609541b1ed 100644 (file)
--- a/src/lib/stats/observation.cc
+++ b/src/lib/stats/observation.cc
@@ -389,7 +389,6 @@ std::string Observation::typeToText(Type type) {
 
 isc::data::ConstElementPtr
 Observation::getJSON() const {
-
     ElementPtr list = isc::data::Element::createList(); // multiple observations
     ElementPtr entry;
     ElementPtr value;