Merge pull request #1011 from london89/alpha

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

Author: sergejey

cycle.php

@@ -42,6 +42,9 @@
 
 echo "CONNECTED TO DB" . PHP_EOL;
 
+// создаем табличку 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;');
+
 $old_mask = umask(0);
 if (is_dir(ROOT . 'cached')) {
     DebMes("Removing cache from " . ROOT . 'cached');
@@ -355,6 +358,9 @@
         }
 
         $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];
@@ -365,7 +371,8 @@
                     $auto_restarts[] = $title;
                 }
 
-                $cycle_updated_timestamp = getGlobal($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) &&

lib/caching.class.php

@@ -1,4 +1,44 @@
 <?php
+
+function saveCycleToCache($key, $value)
+{
+        $key = strtolower($key);
+
+    if (is_array($value) || strlen($value) > 255) {
+        SQLExec("DELETE FROM cyclesRun WHERE KEYWORD='".$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']) . "')";
+    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'];
+    } else {
+        return false;
+    }
+}
+
+
 /**
  * Summary of clearCacheData
  * @param mixed $prefix prefix

lib/objects.class.php

@@ -603,12 +603,17 @@ function getGlobal($varname)
         $object_name = 'ThisComputer';
     }
     $cached_name = 'MJD:' . $object_name . '.' . $varname;
-    $cached_value = checkFromCache($cached_name);
-
+    if (strpos($varname,'cycle_') == 0 && strpos($varname,'Run') !== FALSE) {
+        $cached_value = checkCycleFromCache($cached_name);
+    } else {
+        $cached_value = checkFromCache($cached_name);
+    }
     if ($cached_value !== false) {
         return $cached_value;
     }
+
     $obj = getObject($object_name);
+
     if ($obj) {
         $value = $obj->getProperty($varname);
         return $value;
@@ -912,6 +917,10 @@ 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);
+        return;
+    }
 
     $tmp = explode('.', $varname);