stanley-king il y a 3 ans
Parent
commit
36b71ffa70

+ 1 - 1
docker/compose/stanley/docker-compose.yml

@@ -102,7 +102,7 @@ services:
     links:
       - redisrv
     container_name: "panda-codispatcher"
-    command: [php,"/var/www/html/rdispatcher/codispatcher.php","5"]
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","1"]
     depends_on:
       - "redisrv"
 

+ 1 - 1
plot/DataCenter.py

@@ -418,7 +418,7 @@ class DataCenter(object):
                     self.log_time(day_stamp,time_sec,start_time,cur_min)
                     ratios = self._calc_ratio(start_time=start_time, end_time=cur_min)
                     if ratios != None:
-                        r.set('nc_channel_ratios', json.dumps(ratios))
+                        r.set(f"nc_channel_ratios", json.dumps(ratios))
             except Exception as ex:
                 print(ex)
             finally:

+ 3 - 1
rdispatcher/codispatcher.php

@@ -98,12 +98,14 @@ function ratio_update(&$waiting_quit)
     $cur_min = 0;
     while (!$waiting_quit)
     {
+        Log::record("ratio_update start calc",Log::DEBUG);
+
         for ($i = 0; $i < 61; $i++) {
             $cur_time = time();
             $time_sec = $cur_time;
             $next_min = $time_sec - $time_sec % 60;
 
-            if(($next_min > $cur_min && $time_sec % 60 == 3) || $waiting_quit) {
+            if($next_min > $cur_min && $time_sec % 60 == 3) {
                 $cur_min = $next_min;
                 break;
             } else {