odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] http: support old version of psutil 

Add support for older versions of psutil (<1.2.0). Only used when
debug_rpc is enabled.

Closes #5108, #5163
This commit is contained in:
Ravi Gohil 2015-03-01 02:17:04 +01:00 committed by Antony Lesuisse
parent ccf021938d
commit 04de292885
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/http.py
View File

@ -559,7 +559,7 @@ class JsonRequest(WebRequest):
start_time = time.time()
_, start_vms = 0, 0
if psutil:
_, start_vms = psutil.Process().get_memory_info()
_, start_vms = psutil.Process(os.getpid()).get_memory_info()
if rpc_request and rpc_response_flag:
rpc_request.debug('%s: %s %s, %s',
endpoint, model, method, pprint.pformat(args))
@ -570,7 +570,7 @@ class JsonRequest(WebRequest):
end_time = time.time()
_, end_vms = 0, 0
if psutil:
_, end_vms = psutil.Process().get_memory_info()
_, end_vms = psutil.Process(os.getpid()).get_memory_info()
logline = '%s: %s %s: time:%.3fs mem: %sk -> %sk (diff: %sk)' % (
endpoint, model, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
if rpc_response_flag: