Merge "Add check for psutil process.get_cpu_times()" into R3.2

Juniper · Mar 29, 2017 · 171e345 · 171e345
2 parents 01756f4 + 9c9b767
commit 171e345
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/nodemgr/common/cpuinfo.py b/src/nodemgr/common/cpuinfo.py
@@ -112,7 +112,10 @@ def _get_process_cpu_share(self):
         last_cpu = self.last_cpu
         last_time = self.last_time
 
-        current_cpu = self._process.get_cpu_times()
+        if hasattr(self._process, 'get_cpu_times'):
+            current_cpu = self._process.get_cpu_times()
+        else:
+            current_cpu = self._process.cpu_times()
         current_time = os.times()[4]
 
         # tracking system/user time only