- TresholdsGovernor::packData bug fixed: now uses keepCountsFor param…

…eter,

    now returns array with until when each type of data was deleted

doc/changelog.txt

@@ -96,8 +96,11 @@ AuthenticationGuardBundle Issue #6 Add a function for clean-up of the RequestCou
     ::insertOrIncrementFailureCount $rejection parameter added
 - DbalGateway::insertOrIncrementCount, ::incrementCountWhereId, ::createRequestCountsWith
     parameter $blockedCounterName added
-comitted, not pushed.
-    (blocked columns and statistics need tests and documentation,
-    statistics UI need refactoring from UserBundle)
+comitted, pushed.
 -----------------------------------------------------------
+- TresholdsGovernor::packData bug fixed: now uses keepCountsFor parameter,
+    now returns array with until when each type of data was deleted
 
+---------------------------------------------------------
+    (blocked columns and statistics need tests and documentation,
+    statistics UI need refactoring from UserBundle)

src/Metaclass/TresholdsGovernor/Service/TresholdsGovernor.php

@@ -286,17 +286,21 @@ public function adminReleaseIpAddress()
      *  Packing RequestCounts into ones with longer durations has not yet been implemented. */ 
     public function packData() 
     {
-        $this->requestCountsManager->deleteCountsUntil($this->getMinBlockingLimit());
+        $limit = new \DateTime("$this->dtString - $this->keepCountsFor");
+        $this->requestCountsManager->deleteCountsUntil($limit);
+        $result["requestcounts_deleted_until"] = $limit;
         //idea pack RequestCounts to lower granularity for period between both limits
 
-        $limit = new \DateTime($this->dtString);
         if ($this->allowReleasedUserOnAddressFor) {
             $limit = min($limit, new \DateTime("$this->dtString - $this->allowReleasedUserOnAddressFor"));
         }
         if ($this->allowReleasedUserByCookieFor) {
             $limit = min($limit, new \DateTime("$this->dtString - $this->allowReleasedUserByCookieFor"));
         }        
         $this->releasesManager->deleteReleasesUntil($limit);
+        $result["releases_deleted_until"] = $limit;
+
+        return $result;
     }
 
     public function getMinBlockingLimit()