summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRazvan Becheriu <razvan@isc.org>2019-08-05 20:22:05 +0200
committerRazvan Becheriu <razvan@isc.org>2023-03-24 11:12:40 +0100
commit7028fa48748f99b49538e3a589eed3a39305a83a (patch)
tree5526f6e22e51535e4da1497c0b5309cb19e0e2e3
parent[#2799] call setMode only on config-set (diff)
downloadkea-7028fa48748f99b49538e3a589eed3a39305a83a.tar.xz
kea-7028fa48748f99b49538e3a589eed3a39305a83a.zip
[#728,!461] replaced hardcoded values and minor changes
-rw-r--r--src/bin/dhcp4/ctrl_dhcp4_srv.cc7
-rw-r--r--src/bin/dhcp6/ctrl_dhcp6_srv.cc7
-rw-r--r--src/lib/stats/observation.cc1
3 files changed, 2 insertions, 13 deletions
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index c0b66ee149..66a369b118 100644
--- 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 717bf66786..55c3046dbf 100644
--- 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 2128f53a59..cd089258ba 100644
--- 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;