Merge lp:~camptocamp/openobject-server/7.0-fix_1305653-afe into lp:openobject-server/7.0

Proposed by Alexandre Fayolle - camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-server/7.0-fix_1305653-afe
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/service/ (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/7.0-fix_1305653-afe
Reviewer Review Type Date Requested Status
Lionel Sausin - Initiatives/Numérigraphe (community) code review, not test Approve
OpenERP Core Team Pending
Review via email:

Description of the change

add missing parameter to logging statement

To post a comment you must log in.
Revision history for this message
Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives) :
review: Approve (code review, not test)

Unmerged revisions

5088. By Alexandre Fayolle - camptocamp on 2014-04-10

[FIX] add missing argument to logging message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/service/'
2--- openerp/service/ 2013-07-24 08:34:54 +0000
3+++ openerp/service/ 2014-04-10 09:52:04 +0000
4@@ -269,7 +269,7 @@
5 r = resource.getrusage(resource.RUSAGE_SELF)
6 cpu_time = r.ru_utime + r.ru_stime
7 def time_expired(n, stack):
8-'Worker (%d) CPU time limit (%s) reached.', config['limit_time_cpu'])
9+'Worker (%d) CPU time limit (%s) reached.', os.getpid(), config['limit_time_cpu'])
10 # We dont suicide in such case
11 raise Exception('CPU time limit exceeded.')
12 signal.signal(signal.SIGXCPU, time_expired)