Merge pull request #1027 from london89/alpha

Изменения контроля циклов

Author: sergejey

cycle.php

@@ -95,7 +95,9 @@
 echo "\n";
 
 // создаем табличку cyclesRun, если её нет
-SQLExec('CREATE TABLE IF NOT EXISTS `cyclesRun` (`KEYWORD` char(100) NOT NULL,`DATAVALUE` char(255) NOT NULL,PRIMARY KEY (`KEYWORD`)) ENGINE=MEMORY DEFAULT CHARSET=utf8;');
+SQLExec('CREATE TABLE IF NOT EXISTS `cached_cycles` (`TITLE` char(100) NOT NULL,`VALUE` char(255) NOT NULL,PRIMARY KEY (`TITLE`)) ENGINE=MEMORY DEFAULT CHARSET=utf8;');
+SQLExec('DROP TABLE IF EXISTS cyclesRun;');
+
 
 $old_mask = umask(0);
 if (is_dir(ROOT . 'cached')) {
@@ -260,6 +262,8 @@
 $qry = "1 AND (TITLE LIKE 'cycle%Run' OR TITLE LIKE 'cycle%Control' OR TITLE LIKE 'cycle%Disabled' OR TITLE LIKE 'cycle%AutoRestart')";
 $thisCompObject = getObject('ThisComputer');
 $cycles_records = SQLSelect("SELECT properties.* FROM properties WHERE $qry ORDER BY TITLE");
+SQLExec("DELETE FROM cached_cycles");
+
 $total = count($cycles_records);
 for ($i = 0; $i < $total; $i++) {
     DebMes("Removing property ThisComputer.$property (object ".$thisCompObject->id.")",'threads');
@@ -381,21 +385,30 @@
     if ((time() - $last_cycles_control_check) >= 5 || !empty($result)) {
 
         $last_cycles_control_check = time();
+        $cyclesControls=$cyclesTimestamps=array();
+        $tmpcyclesTimestamps=SQLSelect("SELECT * FROM cached_cycles;");
+
+        $total = count($tmpcyclesTimestamps);
+        foreach ($tmpcyclesTimestamps as $k => $v) {
+                if (strpos($v['TITLE'],'Run') !== FALSE) {
+                        $cyclesTimestamps[$v['TITLE']] = $v['VALUE'];
+                } else if (strpos($v['TITLE'],'Control') !== FALSE) {
+                        $cyclesControls[$v['TITLE']] = $v['VALUE'];
+                }
+        }
 
-        $qry = "OBJECT_ID=" . $thisComputerObject->id . " AND (TITLE LIKE 'cycle%Run' OR TITLE LIKE 'cycle%Control')";
-        $cycles = SQLSelect("SELECT properties.* FROM properties WHERE $qry ORDER BY TITLE");
-
-        $total = count($cycles);
         $seen = array();
         for ($i = 0; $i < $total; $i++) {
-            $title = $cycles[$i]['TITLE'];
+            $title = $tmpcyclesTimestamps[$i]['TITLE'];
             $title = preg_replace('/Run$/', '', $title);
             $title = preg_replace('/Control$/', '', $title);
             if (isset($seen[$title])) {
                 continue;
             }
             $seen[$title] = 1;
-            $control = getGlobal($title . 'Control');
+            $control='';
+
+            if (isset($cyclesControls[$title . 'Control'])) $control = $cyclesControls[$title . 'Control'];
             if ($control != '') {
                 DebMes("Got control command '$control' for " . $title, 'threads');
                 if ($control == 'stop') {
@@ -410,9 +423,7 @@
         }
 
         $is_running = array();
-        $tmpcyclesTimestamps=SQLSelect("SELECT * FROM cyclesRun;");
-        foreach ($tmpcyclesTimestamps as $k => $v) $cyclesTimestamps[$v['KEYWORD']] = $v['DATAVALUE'];
-        
+
         foreach ($threads->commandLines as $id => $cmd) {
             if (preg_match('/(cycle_.+?)\.php/is', $cmd, $m)) {
                 $title = $m[1];
@@ -422,14 +433,9 @@
                     DebMes("Adding $title to auto-recovery list", 'threads');
                     $auto_restarts[] = $title;
                 }
+                $cycle_updated_timestamp=$cyclesTimestamps[$title.'Run'];
 
-                //$cycle_updated_timestamp = getGlobal($title . 'Run');
-                $cycle_updated_timestamp=$cyclesTimestamps[strtolower('MJD:ThisComputer.'.$title.'Run')];
-                if (!isset($to_start[$title]) &&
-                    $cycle_updated_timestamp &&
-                    in_array($title, $auto_restarts) &&
-                    ((time() - $cycle_updated_timestamp) > 30 * 60)
-                ) { //
+                if (!$to_start[$title] && $cycle_updated_timestamp && in_array($title, $auto_restarts) && ((time() - $cycle_updated_timestamp) > 30 * 60)) { //
                     DebMes("Looks like $title is dead (updated: ".date('Y-m-d H:i:s',$cycle_updated_timestamp)."). Need to recovery", 'threads');
                     registerError('cycle_hang', $title);
                     setGlobal($title . 'Control', 'restart');
@@ -438,6 +444,7 @@
         }
     }
 
+
     if (isRebootRequired()) {
         if (!$reboot_timer) {
             $reboot_timer = time();

lib/caching.class.php

@@ -2,43 +2,40 @@
 
 function saveCycleToCache($key, $value)
 {
-        $key = strtolower($key);
-
     if (is_array($value) || strlen($value) > 255) {
-        SQLExec("DELETE FROM cyclesRun WHERE KEYWORD='".$key."'");
+        SQLExec("DELETE FROM cached_cycles WHERE TITLE='".$key."'");
         return;
     }
 
-
     if (isset($_SERVER['REQUEST_METHOD'])) {
         global $memory_cycle_cache;
         $memory_cycle_cache[$key] = $value;
     }
-        $rec = array('KEYWORD' => $key, 'DATAVALUE' => $value);
-    $sqlQuery = "REPLACE INTO cyclesRun (KEYWORD, DATAVALUE) " .
-        " VALUES ('" . DbSafe1($rec['KEYWORD']) . "', " .
-        "'" . DbSafe1($rec['DATAVALUE']) . "')";
+        $rec = array('TITLE' => $key, 'VALUE' => $value);
+    $sqlQuery = "REPLACE INTO cached_cycles (TITLE, VALUE) " .
+        " VALUES ('" . DbSafe1($rec['TITLE']) . "', " .
+        "'" . DbSafe1($rec['VALUE']) . "')";
     SQLExec($sqlQuery);
 }
 
 function checkCycleFromCache($key)
 {
-$key = strtolower($key);
     if (isset($_SERVER['REQUEST_METHOD'])) {
             global $memory_cycle_cache;
                 if (is_array($memory_cycle_cache) && isset($memory_cycle_cache[$key])) {
                     return $memory_cycle_cache[$key];
                 }
         }
-        $rec = SQLSelectOne("SELECT * FROM cyclesRun WHERE KEYWORD = '" . DBSafe($key) . "'");
-    if ($rec['KEYWORD']) {
-        return $rec['DATAVALUE'];
+        $rec = SQLSelectOne("SELECT * FROM cached_cycles WHERE TITLE = '" . DBSafe($key) . "'");
+    if ($rec['TITLE']) {
+        return $rec['VALUE'];
     } else {
         return false;
     }
 }
 
 
+
 /**
  * Summary of clearCacheData
  * @param mixed $prefix prefix

lib/objects.class.php

@@ -603,8 +603,9 @@ function getGlobal($varname)
         $object_name = 'ThisComputer';
     }
     $cached_name = 'MJD:' . $object_name . '.' . $varname;
-    if (strpos($varname,'cycle_') == 0 && strpos($varname,'Run') !== FALSE) {
-        $cached_value = checkCycleFromCache($cached_name);
+
+    if (strpos($varname,'cycle_') === 0) {
+        $cached_value = checkCycleFromCache($varname);
     } else {
         $cached_value = checkFromCache($cached_name);
     }
@@ -622,6 +623,7 @@ function getGlobal($varname)
     }
 }
 
+
 /**
  * getHistoryValueId
  *
@@ -917,8 +919,8 @@ function getHistoryValue($varname, $time, $nerest = false)
  */
 function setGlobal($varname, $value, $no_linked = 0, $source = '')
 {
-    if (strpos($varname,'cycle_') == 0 && strpos($varname,'Run') !== FALSE) {
-        saveCycleToCache('MJD:ThisComputer.'.$varname,$value);
+    if (strpos($varname,'cycle_') === 0) {
+        saveCycleToCache($varname,$value);
         return;
     }
 
@@ -943,6 +945,7 @@ function setGlobal($varname, $value, $no_linked = 0, $source = '')
     }
 }
 
+
 /**
  * Summary of callMethod
  * @param mixed $method_name Method name