From aa753772ab0be59682fa478dbefb359caf2fabae Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 5 Apr 2013 04:42:13 +0200
Subject: [IMP] fetchmail, on demand cron enable a 3 micro hz cron only if
 needed as we want to lower the maximum cron frequency in default addons to 1
 micro hz

bzr revid: al@openerp.com-20130405024213-ll6t26j685rati5a
---
 addons/fetchmail/fetchmail.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'addons/fetchmail/fetchmail.py')

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 4edba8cbe3c..230d3e52f5f 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -90,7 +90,6 @@ class fetchmail_server(osv.osv):
         'script': '/mail/static/scripts/openerp_mailgate.py',
     }
 
-
     def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False, object_id=False):
         port = 0
         values = {}
@@ -176,7 +175,7 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
 
     def _fetch_mails(self, cr, uid, ids=False, context=None):
         if not ids:
-            ids = self.search(cr, uid, [('state','=','done')])
+            ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
         return self.fetch_mail(cr, uid, ids, context=context)
 
     def fetch_mail(self, cr, uid, ids, context=None):
@@ -241,6 +240,26 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
             server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
+    def cron_update(self, cr, uid, context=None):
+        # Enabled/Disable cron based on the number of 'done' server of type pop or imap
+        ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
+        try:
+            cron_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fetchmail', 'ir_cron_mail_gateway_action')[1]
+            self.pool.get('ir.cron').write(cr, 1, [cron_id], {'active': bool(ids)})
+        except ValueError:
+            # Nevermind if default cron cannot be found
+            pass
+
+    def create(self, cr, uid, values, context=None):
+        res = super(fetchmail_server, self).create(cr, uid, values, context=context)
+        self.cron_update(cr, uid, context=context)
+        return res
+
+    def write(self, cr, uid, ids, values, context=None):
+        res = super(fetchmail_server, self).write(cr, uid, ids, values, context=context)
+        self.cron_update(cr, uid, context=context)
+        return res
+
 class mail_mail(osv.osv):
     _inherit = "mail.mail"
     _columns = {
-- 
cgit v1.2.3


From e48383379328b1f5f2fedd361ea464f6e60732a4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 5 Apr 2013 05:00:26 +0200
Subject: [FIX] fetchmail, on demand cron, context test for date write

bzr revid: al@openerp.com-20130405030026-oltyhb537w3p273g
---
 addons/fetchmail/fetchmail.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'addons/fetchmail/fetchmail.py')

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 230d3e52f5f..d408e7da9ac 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -182,6 +182,7 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
         """WARNING: meant for cron usage only - will commit() after each email!"""
         if context is None:
             context = {}
+        context['fetchmail_cron_running'] = True
         mail_thread = self.pool.get('mail.thread')
         action_pool = self.pool.get('ir.actions.server')
         for server in self.browse(cr, uid, ids, context=context):
@@ -241,14 +242,17 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
         return True
 
     def cron_update(self, cr, uid, context=None):
-        # Enabled/Disable cron based on the number of 'done' server of type pop or imap
-        ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
-        try:
-            cron_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fetchmail', 'ir_cron_mail_gateway_action')[1]
-            self.pool.get('ir.cron').write(cr, 1, [cron_id], {'active': bool(ids)})
-        except ValueError:
-            # Nevermind if default cron cannot be found
-            pass
+        if context is None:
+            context = {}
+        if not context.get('fetchmail_cron_running'):
+            # Enabled/Disable cron based on the number of 'done' server of type pop or imap
+            ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
+            try:
+                cron_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fetchmail', 'ir_cron_mail_gateway_action')[1]
+                self.pool.get('ir.cron').write(cr, 1, [cron_id], {'active': bool(ids)})
+            except ValueError:
+                # Nevermind if default cron cannot be found
+                pass
 
     def create(self, cr, uid, values, context=None):
         res = super(fetchmail_server, self).create(cr, uid, values, context=context)
-- 
cgit v1.2.3