From 657bd21baf2b4db73f2b400f0dff120c7900c35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rajmund=20Hru=C5=A1ka?= <rajmund.hruska@cesnet.cz>
Date: Fri, 25 Sep 2020 13:43:33 +0200
Subject: [PATCH] Make matching of python process regexp more general. Redmine
issue #6526
---
lib/mentat/system.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/mentat/system.py b/lib/mentat/system.py
index 75e92576..90e2ae79 100644
--- a/lib/mentat/system.py
+++ b/lib/mentat/system.py
@@ -83,7 +83,7 @@ OVERALL_STATUS_MESSAGES = {
}
-REGEXP_MENTAT_PS = re.compile(r'\s*(\d+)\s+([^\s]+)\s+([^\s]*(?:python(?:3?|3.7)))\s+[^\s]+(mentat-[^\s]+)(?:\s+(.*))?')
+REGEXP_MENTAT_PS = re.compile(r'\s*(\d+)\s+([^\s]+)\s+([^\s]*(?:python(?:\d+(?:\.\d+)?)?))\s+[^\s]+(mentat-[^\s]+)(?:\s+(.*))?')
"""Regular expression for selecting Mentat related processes."""
REGEXP_MENTAT_PIDF = re.compile(r'(.+?)(?:\.(\d+))?\.pid$')
"""Regular expression for selecting Mentat related PID files."""
--
GitLab