Explorar o código

Utils: Debug: psutil get_memory_info is now .memory_info. Closes #3262

Ask Solem %!s(int64=8) %!d(string=hai) anos
pai
achega
152ee2cd42
Modificáronse 1 ficheiros con 8 adicións e 1 borrados
  1. 8 1
      celery/utils/debug.py

+ 8 - 1
celery/utils/debug.py

@@ -148,7 +148,7 @@ def mem_rss():
     """Return RSS memory usage as a humanized string."""
     """Return RSS memory usage as a humanized string."""
     p = ps()
     p = ps()
     if p is not None:
     if p is not None:
-        return humanbytes(p.get_memory_info().rss)
+        return humanbytes(_process_memory_info(p).rss)
 
 
 
 
 def ps():  # pragma: no cover
 def ps():  # pragma: no cover
@@ -158,3 +158,10 @@ def ps():  # pragma: no cover
     if _process is None and Process is not None:
     if _process is None and Process is not None:
         _process = Process(os.getpid())
         _process = Process(os.getpid())
     return _process
     return _process
+
+
+def _process_memory_info(process):
+    try:
+        return process.memory_info()
+    except AttributeError:
+        return process.get_memory_info()