From b34a2bb191208979db60c925aff35ed53d3448ec Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 6 Feb 2009 14:47:41 +0100 Subject: [PATCH 1/2] [REF] cron: use pool of db_name parameter bzr revid: christophe@tinyerp.com-20090206134741-es5ne5artnhxbedd --- bin/addons/base/ir/ir_cron.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py index 2ea8746b883..18f853a0d83 100644 --- a/bin/addons/base/ir/ir_cron.py +++ b/bin/addons/base/ir/ir_cron.py @@ -75,15 +75,18 @@ class ir_cron(osv.osv, netsvc.Agent): f(cr, uid, *args) def _poolJobs(self, db_name, check=False): - if self.pool._init: - self.setAlarm(self._poolJobs, int(time.time())+10*60, [db_name]) + try: + db, pool = pooler.get_db_and_pool(db_name) + if pool._init: + # retry in a few minutes + self.setAlarm(self._poolJobs, int(time.time())+10*60, [db_name]) + cr = db.cursor() + except: + return False + now = DateTime.now() #FIXME: multidb. Solution: a l'instanciation d'une nouvelle connection bd (ds pooler) fo que j'instancie # un nouveau pooljob avec comme parametre la bd - try: - cr = pooler.get_db(db_name).cursor() - except: - return False try: cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority') From 768283bde159406c258f4a90c62eb4e83d97f09f Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 6 Feb 2009 14:56:38 +0100 Subject: [PATCH 2/2] [FIX] maintenance contract: connect to real server bzr revid: christophe@tinyerp.com-20090206135638-ur4vsnilc0of8w7u --- bin/tools/maintenance.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/tools/maintenance.py b/bin/tools/maintenance.py index e23e9c8f7ad..1ba03d0b272 100644 --- a/bin/tools/maintenance.py +++ b/bin/tools/maintenance.py @@ -26,10 +26,10 @@ class RemoteContractException(Exception): pass class remote_contract(object): def __init__(self, contract_id, contract_password, modules=None): - self.__server = 'http://192.168.0.127:8072/xmlrpc/' - self.__db = "maintenance" - self.__password = "admin" - self.__login = "admin" + self.__server = 'http://terp.tinyerp.com:8069/xmlrpc/' + self.__db = "tiny" + self.__password = "maintenance" + self.__login = "maintenance" rpc = xmlrpclib.ServerProxy(self.__server + 'common') try: