Launchpad automatic translations update.

[odoo/odoo.git] / bin / pooler.py

diff --git a/bin/pooler.py b/bin/pooler.py
index c838641..684bc62 100644 (file)
--- a/bin/pooler.py
+++ b/bin/pooler.py
@@ -1,108 +1,82 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import sql_db
-import osv.osv
-import tools
-import addons
-import netsvc
-
-db_dic = {}
 pool_dic = {}
 
-
-def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False):
+def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False, pooljobs=True):
     if not status:
         status={}
-    if db_name in db_dic:
-        db = db_dic[db_name]
-    else:
-        logger = netsvc.Logger()
-        logger.notifyChannel('pooler', netsvc.LOG_INFO, 'Connecting to %s' % (db_name.lower()))
-        db = sql_db.db_connect(db_name)
-        db_dic[db_name] = db
+
+    db = get_db_only(db_name)
 
     if db_name in pool_dic:
         pool = pool_dic[db_name]
     else:
+        import addons
+        import osv.osv
         pool = osv.osv.osv_pool()
         pool_dic[db_name] = pool
-        addons.load_modules(db, force_demo, status, update_module)
-        cr = db.cursor()
-        pool.init_set(cr, False)
-        cr.commit()
-        cr.close()
-
-        if not update_module:
-            import report
-            report.interface.register_all(db)
-            pool.get('ir.cron')._poolJobs(db.dbname)
-    return db, pool
 
+        try:
+            addons.load_modules(db, force_demo, status, update_module)
+        except Exception:
+            del pool_dic[db_name]
+            raise
 
-def restart_pool(db_name, force_demo=False, update_module=False):
-#   del db_dic[db_name]
-    del pool_dic[db_name]
-    return get_db_and_pool(db_name, force_demo, update_module=update_module)
+        cr = db.cursor()
+        try:
+            pool.init_set(cr, False)
+            pool.get('ir.actions.report.xml').register_all(cr)
+            cr.commit()
+        finally:
+            cr.close()
+
+        if pooljobs:
+            pool.get('ir.cron').restart(db.dbname)
+    return db, pool
 
 
-def close_db(db_name):
-    if db_name in db_dic:
-        db_dic[db_name].truedb.close()
-        del db_dic[db_name]
+def restart_pool(db_name, force_demo=False, status=None, update_module=False):
     if db_name in pool_dic:
         del pool_dic[db_name]
+    return get_db_and_pool(db_name, force_demo, status, update_module=update_module)
 
 
 def get_db_only(db_name):
-    if db_name in db_dic:
-        db = db_dic[db_name]
-    else:
-        db = sql_db.db_connect(db_name)
-        db_dic[db_name] = db
+    # ATTENTION:
+    # do not put this import outside this function
+    # sql_db must not be loaded before the logger is initialized.
+    # sql_db import psycopg2.tool which create a default logger if there is not.
+    # this resulting of having the logs outputed twice...
+    import sql_db
+    db = sql_db.db_connect(db_name)
     return db
 
 
 def get_db(db_name):
-#   print "get_db", db_name
     return get_db_and_pool(db_name)[0]
 
 
 def get_pool(db_name, force_demo=False, status=None, update_module=False):
-#   print "get_pool", db_name
     pool = get_db_and_pool(db_name, force_demo, status, update_module)[1]
-#   addons.load_modules(db_name, False)
-#   if not pool.obj_list():
-#       pool.instanciate()
-#   print "pool", pool
     return pool
-#   return get_db_and_pool(db_name)[1]
-
-
-def init():
-    global db
-#   db = get_db_only(tools.config['db_name'])
-    sql_db.init()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-