DataObjects/Core_domain.php

[Pman.Core] / Prune.php

diff --git a/Prune.php b/Prune.php
index c0a6c29..d827318 100644 (file)
--- a/Prune.php
+++ b/Prune.php
@@ -52,6 +52,8 @@ class Pman_Core_Prune extends Pman
         $f->query("
             DELETE FROM Events where 
                   event_when < NOW() - INTERVAL {$inM} MONTH
+                  AND
+                  action != 'NOTIFY'
                   LIMIT 100000
         ");
         
@@ -67,25 +69,34 @@ class Pman_Core_Prune extends Pman
         */
         // rather than deleting them all, it's probably best to just delete notify events that occured to often.
         // eg. when we tried to deliver multiple times without success...
+        /*
+         *
+         SELECT on_id, on_table, min(id) as min_id, max(id) as max_id, count(*) as mm FROM Events
+         WHERE action = 'NOTIFY' and event_when < NOW() - INTERVAL 1 WEEK GROUP BY  on_id, on_table HAVING  mm > 2 ORDER BY mm desc;
+         */
         
-        
+        //DB_DataObject::debugLevel(1);
         $f = DB_DataObject::Factory('Events');
         $f->selectAdd();
-        $f->selectAdd("on_id, min(id) as min_id, max(id) as max_id, count(*) as mm");
+        $f->selectAdd("on_id, on_table, min(id) as min_id, max(id) as max_id, count(*) as mm");
         $f->whereAdd("action = 'NOTIFY' and event_when < NOW() - INTERVAL 1 WEEK");
-        $f->groupBy('on_id');
+        $f->groupBy('on_id, on_table');
         $f->having("mm > 2");
         $f->orderBy('mm desc') ;
-        $f->limit(1000);
+        $f->limit(10000);
         $ar = $f->fetchAll();
         foreach($ar as $f) {
-            $f = DB_DataObject::Factory('Events');
-            $f->query("DELETE FROM Events where 
+            $q = DB_DataObject::Factory('Events');
+            $q->query("DELETE FROM Events where 
                   action = 'NOTIFY'
                   AND
                   on_id = {$f->on_id}
                   AND
-                  id > {$f->min_id} AND id < {$f->max_id}
+                  on_table = '{$q->escape($f->on_table)}'
+                  AND
+                  id > {$f->min_id}
+                  AND
+                  id < {$f->max_id}
             ");
         }