Merge lp:~therp-nl/openobject-server/7.0_lp1298258_join_and_sleep into lp:openobject-server/7.0

[Ronald Portier (Therp)]

Prevent log from filling up with messages when there are difficulties ending all threads on server stop.

Unmerged revisions

5308. By Ronald Portier (Therp) on 2014-05-29

[FIX] Prevent filling up log with messages when there are difficulties
    ending all threads on server stop.

=== modified file 'openerp/service/__init__.py'
--- openerp/service/__init__.py	2013-06-12 15:19:12 +0000
+++ openerp/service/__init__.py	2014-05-29 11:16:08 +0000
@@ -94,6 +94,14 @@
     # Start the main cron thread.
     cron.start_service()
 
+def log_repeating_message(msg, counter):
+    '''Utility function to log repeated messages, withouth overflowing log'''
+    if (counter <= 10
+            or (counter <= 100 and (counter % 10 == 0))
+            or (counter <= 1000 and (counter % 100 == 0))
+            or (counter > 1999 and (counter % 1000 == 0))):
+        _logger.debug('%d: %s' % (counter, msg))
+
 def stop_services():
     """ Stop all services. """
     # stop services
@@ -112,8 +120,11 @@
     for thread in threading.enumerate():
         _logger.debug('process %r (%r)', thread, thread.isDaemon())
         if thread != me and not thread.isDaemon() and thread.ident != main_thread_id:
+            msg_counter = 0
+            msg = 'join and sleep %s' % thread.name
             while thread.isAlive():
-                _logger.debug('join and sleep')
+                msg_counter += 1
+                log_repeating_message(msg, msg_counter)
                 # Need a busyloop here as thread.join() masks signals
                 # and would prevent the forced shutdown.
                 thread.join(0.05)