Prune.php

[Pman.Core] / Prune.php

diff --git a/Prune.php b/Prune.php
index 594181c..c0a6c29 100644 (file)
--- a/Prune.php
+++ b/Prune.php
@@ -56,7 +56,7 @@ class Pman_Core_Prune extends Pman
         ");
         
         // notificication events occur alot - so we should trash them more frequently..
-        $f = DB_DataObject::Factory('reader_article');
+      /*  $f = DB_DataObject::Factory('reader_article');
         $f->query("
             DELETE FROM Events where 
                   event_when < NOW() - INTERVAL 1 MONTH
@@ -64,7 +64,7 @@ class Pman_Core_Prune extends Pman
                   action IN ('NOTIFY')
                   LIMIT 100000
         ");
-        
+        */
         // 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...
         
@@ -72,7 +72,7 @@ class Pman_Core_Prune extends Pman
         $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->whereAdd("action = 'NOTIFY' and event_when < NOW() - INTERVAL 2 WEEK");
+        $f->whereAdd("action = 'NOTIFY' and event_when < NOW() - INTERVAL 1 WEEK");
         $f->groupBy('on_id');
         $f->having("mm > 2");
         $f->orderBy('mm desc') ;
@@ -83,8 +83,6 @@ class Pman_Core_Prune extends Pman
             $f->query("DELETE FROM Events where 
                   action = 'NOTIFY'
                   AND
-                  event_when < NOW() - INTERVAL 2 WEEK
-                  AND
                   on_id = {$f->on_id}
                   AND
                   id > {$f->min_id} AND id < {$f->max_id}