Merge pull request #2127 from sever-sever/T2298-eq

T2298: vyos.util: extend process_named_running() signature with cmdline

1 files changed, 7 insertions, 5 deletions

diff --git a/python/vyos/util.py b/python/vyos/util.py
index 32a5ae116..4df046a36 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -462,15 +462,17 @@ def process_running(pid_file):
         pid = f.read().strip()
     return pid_exists(int(pid))
 
-
-def process_named_running(name):
+def process_named_running(name, cmdline: str=None):
     """ Checks if process with given name is running and returns its PID.
     If Process is not running, return None
     """
     from psutil import process_iter
-    for p in process_iter():
-        if name in p.name():
-            return p.pid
+    for p in process_iter(['name', 'pid', 'cmdline']):
+        if cmdline:
+            if p.info['name'] == name and cmdline in p.info['cmdline']:
+                return p.info['pid']
+        elif p.info['name'] == name:
+            return p.info['pid']
     return None