From 36ecb63f2c339be0a61a7f6498fd9b092938ee1e Mon Sep 17 00:00:00 2001
From: Stephen Medina <stephenm@lsm.org>
Date: Wed, 23 Mar 2016 13:57:39 -0700
Subject: [PATCH] [FIX] support psutils >= 4.0

---
 openerp/service/server.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 50a7f7f2ee5..46c5c15fe1a 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -47,7 +47,8 @@ SLEEP_INTERVAL = 60     # 1 min
 def memory_info(process):
     """ psutil < 2.0 does not have memory_info, >= 3.0 does not have
     get_memory_info """
-    return (getattr(process, 'memory_info', None) or process.get_memory_info)()
+    pmem = (getattr(process, 'memory_info', None) or process.get_memory_info)()
+    return (pmem.rss, pmem.vms)
 
 #----------------------------------------------------------
 # Werkzeug WSGI servers patched