[IMP] cron: no master cron thread when no workers are needed.

bzr revid: vmt@openerp.com-20120213115354-qa4kqx6hea82q8se

diff --git a/openerp/cron.py b/openerp/cron.py
index 7b67877..8551ed7 100644 (file)
--- a/openerp/cron.py
+++ b/openerp/cron.py
@@ -204,9 +204,12 @@ def start_master_thread():
         _logger.warning("Connection pool size (%s) is set lower than max number of cron threads (%s), "
                         "this may cause trouble if you reach that number of parallel cron tasks.",
                         db_maxconn, _thread_slots)
-    t = threading.Thread(target=runner, name="openerp.cron.master_thread")
-    t.setDaemon(True)
-    t.start()
-    _logger.debug("Master cron daemon started!")
+    if _thread_slots:
+        t = threading.Thread(target=runner, name="openerp.cron.master_thread")
+        t.setDaemon(True)
+        t.start()
+        _logger.debug("Master cron daemon started!")
+    else:
+        _logger.info("No master cron daemon (0 workers needed).")
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py
index 9053eb8..bc04d45 100644 (file)
--- a/openerp/modules/registry.py
+++ b/openerp/modules/registry.py
@@ -286,7 +286,6 @@ class RegistryManager(object):
                 cr = registry.db.cursor()
                 r = 1
                 try:
-                    pass
                     cr.execute("select nextval('base_cache_signaling')")
                     r = cr.fetchone()[0]
                 finally:

diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index bc9a83b..c387d27 100644 (file)
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -65,7 +65,7 @@ def start_services():
     netrpc_server.init_servers()
 
     # Start the main cron thread.
-    #openerp.cron.start_master_thread()
+    openerp.cron.start_master_thread()
 
     # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
     openerp.netsvc.Server.startAll()