From: Razvan Becheriu <razvan@isc.org>
Date: Mon, 27 Jul 2020 15:35:31 +0000 (+0300)
Subject: [#1065] addressed review
X-Git-Tag: Kea-1.8.0~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0ae36d19a18ca985a945a00f2c19a831a236cb;p=thirdparty%2Fkea.git

[#1065] addressed review
---

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 1f790d99fb..7b61e801af 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -1855,9 +1855,6 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
             num = LeaseMgrFactory::instance().wipeLeases4(id);
             ids << " " << id;
 
-            int64_t previous_reclaimed = StatsMgr::instance().getObservation(
-                StatsMgr::generateName("subnet", id, "reclaimed-leases"))->getInteger().first;
-
             int64_t previous_declined = StatsMgr::instance().getObservation(
                 StatsMgr::generateName("subnet", id, "declined-addresses"))->getInteger().first;
 
@@ -1865,16 +1862,11 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
                 StatsMgr::generateName("subnet", id, "assigned-addresses"),
                 int64_t(0));
 
-            StatsMgr::instance().setValue(
-                StatsMgr::generateName("subnet", id, "reclaimed-leases"),
-                int64_t(0));
 
             StatsMgr::instance().setValue(
                 StatsMgr::generateName("subnet", id, "declined-addresses"),
                 int64_t(0));
 
-            StatsMgr::instance().addValue("reclaimed-leases", -previous_reclaimed);
-
             StatsMgr::instance().addValue("declined-addresses", -previous_declined);
         } else {
             // Wipe them all!
@@ -1890,17 +1882,11 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
                     StatsMgr::generateName("subnet", sub->getID(), "assigned-addresses"),
                     int64_t(0));
 
-                StatsMgr::instance().setValue(
-                    StatsMgr::generateName("subnet", sub->getID(), "reclaimed-leases"),
-                    int64_t(0));
-
                 StatsMgr::instance().setValue(
                     StatsMgr::generateName("subnet", sub->getID(), "declined-addresses"),
                     int64_t(0));
             }
 
-            StatsMgr::instance().setValue("reclaimed-leases", int64_t(0));
-
             StatsMgr::instance().setValue("declined-addresses", int64_t(0));
         }
 
@@ -1944,9 +1930,6 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
             num = LeaseMgrFactory::instance().wipeLeases6(id);
             ids << " " << id;
 
-            int64_t previous_reclaimed = StatsMgr::instance().getObservation(
-                StatsMgr::generateName("subnet", id, "reclaimed-leases"))->getInteger().first;
-
             int64_t previous_declined = StatsMgr::instance().getObservation(
                 StatsMgr::generateName("subnet", id, "declined-addresses"))->getInteger().first;
 
@@ -1958,16 +1941,10 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                 StatsMgr::generateName("subnet", id, "assigned-pds"),
                 int64_t(0));
 
-            StatsMgr::instance().setValue(
-                StatsMgr::generateName("subnet", id, "reclaimed-leases"),
-                int64_t(0));
-
             StatsMgr::instance().setValue(
                 StatsMgr::generateName("subnet", id, "declined-addresses"),
                 int64_t(0));
 
-            StatsMgr::instance().addValue("reclaimed-leases", -previous_reclaimed);
-
             StatsMgr::instance().addValue("declined-addresses", -previous_declined);
        } else {
             // Wipe them all!
@@ -1987,17 +1964,11 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                     StatsMgr::generateName("subnet", sub->getID(), "assigned-pds"),
                     int64_t(0));
 
-                StatsMgr::instance().setValue(
-                    StatsMgr::generateName("subnet", sub->getID(), "reclaimed-leases"),
-                    int64_t(0));
-
                 StatsMgr::instance().setValue(
                     StatsMgr::generateName("subnet", sub->getID(), "declined-addresses"),
                     int64_t(0));
             }
 
-            StatsMgr::instance().setValue("reclaimed-leases", int64_t(0));
-
             StatsMgr::instance().setValue("declined-addresses", int64_t(0));
         }