-def get_db_and_pool(db_name, force_demo=False, status={}, update_module=False):
- 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))
- db = sql_db.db_connect(db_name)
- db_dic[db_name] = db
-
- if db_name in pool_dic:
- pool = pool_dic[db_name]
- else:
- pool = osv.osv.osv_pool()
- pool_dic[db_name] = pool
- addons.load_modules(db, force_demo, status, update_module)
-
- if not update_module:
- import report
- report.interface.register_all(db)
- pool.get('ir.cron')._poolJobs(db.dbname)
- return db, pool
-
-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)
-
-def close_db(db_name):
- if db_name in db_dic:
- db_dic[db_name].truedb.close()
- del db_dic[db_name]
- if db_name in pool_dic:
- del pool_dic[db_name]
+def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False, pooljobs=True):
+ if not status:
+ status={}
+
+ 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
+
+ try:
+ addons.load_modules(db, force_demo, status, update_module)
+ except Exception:
+ del pool_dic[db_name]
+ raise
+
+ 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 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)
+