stanley-king 3 lat temu
rodzic
commit
ffc6822086
3 zmienionych plików z 11 dodań i 9 usunięć
  1. 6 5
      plot/DataCenter.py
  2. 1 1
      plot/MchDataCenter.py
  3. 4 3
      plot/SpeedDataCenter.py

+ 6 - 5
plot/DataCenter.py

@@ -14,6 +14,7 @@ import time as time
 
 
 class DataCenter(object):
+    latest_delta = 2
     pos_map = {
         'commit-succ': 0, 'commit-fail': 1, 'notify-succ': 2, 'notify-fail': 3, 'user_succ': 4
     }
@@ -43,19 +44,19 @@ class DataCenter(object):
                 else:
                     hfive = h5py.File(self._file_name, 'w')
 
+                latest_time = int(stime.time()) - self.latest_delta
                 self.read_redis(hfive, r, 'nc_channel_monitor_commit', 'commit')
                 self.read_redis(hfive, r, 'nc_channel_monitor_notify', 'notify')
                 hfive.close()
 
-                self.del_redis(r, 'nc_channel_monitor_commit')
-                self.del_redis(r, 'nc_channel_monitor_notify')
+                self.del_redis(r, 'nc_channel_monitor_commit', latest_time)
+                self.del_redis(r, 'nc_channel_monitor_notify', latest_time)
             except Exception as ex:
                 print(ex)
             finally:
-                stime.sleep(1)
+                stime.sleep(0.1)
 
-    def del_redis(self, redis, name):
-        latest_time = int(stime.time()) - 2
+    def del_redis(self, redis, name,latest_time):
         for item in redis.hscan_iter(name):
             key = str(item[0], encoding="utf-8")
             items = re.split(r'-', key)

+ 1 - 1
plot/MchDataCenter.py

@@ -54,7 +54,7 @@ class MchDataCenter(object):
             except Exception as ex:
                 print(ex)
             finally:
-                stime.sleep(1)
+                stime.sleep(0.1)
 
     def del_redis(self, redis, name,latest_time):
         for item in redis.hscan_iter(name):

+ 4 - 3
plot/SpeedDataCenter.py

@@ -9,6 +9,7 @@ from datetime import datetime
 import numpy as np
 
 class SpeedDataCenter(object):
+    latest_delta = 2
     def __init__(self):
         self._mquit = False
         self._mRHost = ''
@@ -35,20 +36,20 @@ class SpeedDataCenter(object):
                 else:
                     hfive = h5py.File(self._file_name, 'w')
 
+                latest_time = int(stime.time()) - self.latest_delta
                 print('read redis:', datetime.now())
                 self.read_redis(hfive, r, 'nc_commit_speed_monitor')
                 hfive.close()
 
                 print('del redis:', datetime.now())
-                self.del_redis(r, 'nc_commit_speed_monitor')
+                self.del_redis(r, 'nc_commit_speed_monitor',latest_time)
                 print('del redis:', datetime.now())
             except Exception as ex:
                 print(ex)
             finally:
                 stime.sleep(0.1)
 
-    def del_redis(self, redis, name):
-        latest_time = int(stime.time()) - 2
+    def del_redis(self, redis, name,latest_time):
         for item in redis.hscan_iter(name):
             key = str(item[0], encoding="utf-8")
             items = re.split(r'-', key)