[#1375] destroy lease manager if type is not memfile

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index c729cb4b17c51d9f13d1beaa34a8e69e9a779f6f..48cdcd85b0121add696829cbd0ca3418b3acb438 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -345,7 +345,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
         // manager and an empty host manager will be created instead.
         auto running_cfg = CfgMgr::instance().getCurrentCfg();
         auto parameters = DatabaseConnection::parse(running_cfg->getCfgDbAccess()->getLeaseDbAccessString());
-        if (parameters["type"] == "mysql" || parameters["type"] == "postgresql") {
+        if (parameters["type"] != "memfile") {
             CfgDbAccess cfg_db;
             cfg_db.setAppendedParameters("universe=4");
             LeaseMgrFactory::create(cfg_db.getLeaseDbAccessString());

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 3d28f9b534d19afcb3166b6a8b84122260270369..7022aeda86d30105499332233bba63e932302c80 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -448,7 +448,7 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
         // manager and an empty host manager will be created instead.
         auto running_cfg = CfgMgr::instance().getCurrentCfg();
         auto parameters = DatabaseConnection::parse(running_cfg->getCfgDbAccess()->getLeaseDbAccessString());
-        if (parameters["type"] == "mysql" || parameters["type"] == "postgresql") {
+        if (parameters["type"] != "memfile") {
             CfgDbAccess cfg_db;
             cfg_db.setAppendedParameters("universe=6");
             LeaseMgrFactory::create(cfg_db.getLeaseDbAccessString());