summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Pavel <andrei@isc.org>2021-08-30 13:13:36 +0200
committerAndrei Pavel <andrei@isc.org>2021-08-30 13:13:36 +0200
commitd9144c54454dee8086303fdd3d0312772ab4572c (patch)
tree288578d81e33a2f1f46f082a0703d30fe8169a46
parent[#2061] fixed TSAN warnings in kea-netconf (diff)
downloadkea-d9144c54454dee8086303fdd3d0312772ab4572c.tar.xz
kea-d9144c54454dee8086303fdd3d0312772ab4572c.zip
[#2061] remove redundant initSysrepo()
-rw-r--r--src/bin/netconf/netconf.cc3
-rw-r--r--src/bin/netconf/netconf_process.cc12
2 files changed, 5 insertions, 10 deletions
diff --git a/src/bin/netconf/netconf.cc b/src/bin/netconf/netconf.cc
index 830d79d454..93866467b3 100644
--- a/src/bin/netconf/netconf.cc
+++ b/src/bin/netconf/netconf.cc
@@ -158,10 +158,11 @@ NetconfAgent::init(NetconfCfgMgrPtr cfg_mgr) {
isc_throw(Unexpected, "missing configuration manager");
return;
}
+
+ // Retrieve configuration from existing running DHCP daemons.
const CfgServersMapPtr& servers =
cfg_mgr->getNetconfConfig()->getCfgServersMap();
for (auto const& pair : *servers) {
- // Retrieve configuration from existing running DHCP daemons.
keaConfig(pair);
}
diff --git a/src/bin/netconf/netconf_process.cc b/src/bin/netconf/netconf_process.cc
index ef1672b119..f8430dd6a7 100644
--- a/src/bin/netconf/netconf_process.cc
+++ b/src/bin/netconf/netconf_process.cc
@@ -5,6 +5,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
+
#include <asiolink/asio_wrapper.h>
#include <netconf/netconf.h>
#include <netconf/netconf_process.h>
@@ -14,8 +15,8 @@
#include <asiolink/io_error.h>
#include <cc/command_interpreter.h>
#include <config/timeouts.h>
+
#include <boost/pointer_cast.hpp>
-#include <thread>
using namespace isc::asiolink;
using namespace isc::config;
@@ -40,15 +41,8 @@ NetconfProcess::run() {
LOG_INFO(netconf_logger, NETCONF_STARTED).arg(VERSION);
try {
- // Initialize netconf agent.
- // Initialize sysrepo.
- agent_.initSysrepo();
-
- // Get the configuration manager.
- NetconfCfgMgrPtr cfg_mgr(getNetconfCfgMgr());
-
// Call init.
- agent_.init(cfg_mgr);
+ agent_.init(getNetconfCfgMgr());
// Let's process incoming data or expiring timers in a loop until
// shutdown condition is detected.