openerp-community-reviewer team mailing list archive

[Alexandre Fayolle - camptocamp <alexandre.fayolle@xxxxxxxxxxxxxx>]

Alexandre Fayolle - camptocamp has proposed merging lp:~camptocamp/ocb-server/7.0-fix_1305653-afe into lp:ocb-server.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1305653 in OpenERP Community Backports (Server): "[7.0] missing arguments to logging statement in workers.py"
  https://bugs.launchpad.net/ocb-server/+bug/1305653

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-server/7.0-fix_1305653-afe/+merge/215121

add missing parameter to logging statement

port of https://code.launchpad.net/~camptocamp/openobject-server/7.0-fix_1305653-afe/+merge/215120 to OCB 
-- 
https://code.launchpad.net/~camptocamp/ocb-server/7.0-fix_1305653-afe/+merge/215121
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~camptocamp/ocb-server/7.0-fix_1305653-afe into lp:ocb-server.

=== modified file 'openerp/service/workers.py'
--- openerp/service/workers.py	2013-11-25 10:38:42 +0000
+++ openerp/service/workers.py	2014-04-10 09:38:11 +0000
@@ -269,7 +269,7 @@
         r = resource.getrusage(resource.RUSAGE_SELF)
         cpu_time = r.ru_utime + r.ru_stime
         def time_expired(n, stack):
-            _logger.info('Worker (%d) CPU time limit (%s) reached.', config['limit_time_cpu'])
+            _logger.info('Worker (%d) CPU time limit (%s) reached.', os.getpid(), config['limit_time_cpu'])
             # We dont suicide in such case
             raise Exception('CPU time limit exceeded.')
         signal.signal(signal.SIGXCPU, time_expired)