From 04de29288559cdb4fe841e80b1f8bf41fb76dbfc Mon Sep 17 00:00:00 2001
From: Ravi Gohil <rgo@odoo.com>
Date: Sun, 1 Mar 2015 02:17:04 +0100
Subject: [PATCH] [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
---
 openerp/http.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 64023602d9d..d56e2d84649 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -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: