sciveo 0.1.61__tar.gz → 0.1.62__tar.gz

{sciveo-0.1.61 → sciveo-0.1.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.61
+Version: 0.1.62
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.61 → sciveo-0.1.62}/sciveo/monitoring/watchdog/process.py

@@ -19,7 +19,7 @@ from sciveo.monitoring.watchdog.base import BaseWatchDogDaemon
 class ProcessWatchDogDaemon(BaseWatchDogDaemon):
   def __init__(self, pid=None, process_cmd=None, period=5, command="echo '⚠️ process error!'", thread_inactive_threshold=None):
     self.process_cmd = process_cmd
-    self.threads = {}
+    self.info_threads = {}
     self.thread_inactive_threshold = thread_inactive_threshold
     super().__init__(threshold_percent=10, period=period, command=command, monitored="Process", monitor_value="is dead")
 
@@ -47,23 +47,24 @@ class ProcessWatchDogDaemon(BaseWatchDogDaemon):
     current_time = time.time()
     for t in process.threads():
       cpu_time = t.user_time + t.system_time
-      if t.id not in self.threads:
-        self.threads[t.id] = {
+      if t.id not in self.info_threads:
+        self.info_threads[t.id] = {
           "id": t.id,
           "start_at": current_time,
           "last_active": current_time,
           "last_cpu": cpu_time
         }
       else:
-        if cpu_time != self.threads[t.id]["last_cpu"]:
-          self.threads[t.id]["last_active"] = current_time
-        self.threads[t.id]["last_cpu"] = cpu_time
+        if cpu_time != self.info_threads[t.id]["last_cpu"]:
+          self.info_threads[t.id]["last_active"] = current_time
+        self.info_threads[t.id]["last_cpu"] = cpu_time
 
   def check_threads(self, pid):
     current_time = time.time()
-    for tid, thr in self.threads.items():
-      if current_time - thr["last_active"] > self.thread_inactive_threshold:
-        warning(f"⚠️ process[{pid}] thread[{tid}] inactive from {thr['last_active']}")
+    for tid, thr in self.info_threads.items():
+      elapsed_time = int(current_time - thr["last_active"])
+      if elapsed_time > self.thread_inactive_threshold:
+        warning(f"⚠️ process[{pid}] thread[{tid}] inactive for {elapsed_time}s.")
 
   def process_value(self, pid):
     try:
@@ -74,7 +75,7 @@ class ProcessWatchDogDaemon(BaseWatchDogDaemon):
           if self.thread_inactive_threshold is not None:
             try:
               self.get_threads(p)
-              self.check_threads()
+              self.check_threads(pid)
             except psutil.NoSuchProcess as e:
               exception(e, pid)
 

sciveo-0.1.62/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.62'

{sciveo-0.1.61 → sciveo-0.1.62}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.61
+Version: 0.1.62
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.61/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.61'