From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 21 Jan 2022 18:15:53 +0000 (+0200)
Subject: [#2279] "loggers" should be inside the Dhcp[4|6] map
X-Git-Tag: Kea-2.1.2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70cf8d8f46b3bb4b3375fb6b5198e4d2295144ff;p=thirdparty%2Fkea.git

[#2279] "loggers" should be inside the Dhcp[4|6] map
---

diff --git a/src/lib/dhcpsrv/srv_config.cc b/src/lib/dhcpsrv/srv_config.cc
index caf0acd60d..0e233581c8 100644
--- a/src/lib/dhcpsrv/srv_config.cc
+++ b/src/lib/dhcpsrv/srv_config.cc
@@ -597,11 +597,8 @@ SrvConfig::sanityChecksLifetime(const SrvConfig& target_config,
 
 ElementPtr
 SrvConfig::toElement() const {
-    // Toplevel map
-    ElementPtr result = ConfigBase::toElement();
-
-    // The "server-tag" is added by configured globals
-    result->remove("server-tag");
+    // Top level map
+    ElementPtr result = Element::createMap();
 
     // Get family for the configuration manager
     uint16_t family = CfgMgr::instance().getFamily();
@@ -609,6 +606,19 @@ SrvConfig::toElement() const {
     // DhcpX global map initialized from configured globals
     ElementPtr dhcp = configured_globals_->toElement();
 
+    auto loggers_info = getLoggingInfo();
+    // Was in the Logging global map.
+    if (!loggers_info.empty()) {
+        // Set loggers list
+        ElementPtr loggers = Element::createList();
+        for (LoggingInfoStorage::const_iterator logger =
+                loggers_info.cbegin();
+             logger != loggers_info.cend(); ++logger) {
+            loggers->add(logger->toElement());
+        }
+        dhcp->set("loggers", loggers);
+    }
+
     // Set user-context
     contextToElement(dhcp);