Merge pull request #1108 from sergejey/alpha

Main cycle restart fix
sergejey · Jan 10, 2024 · 01b47e2 · 01b47e2
2 parents e2c90bb + a7281a3
commit 01b47e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/scripts/cycle_main.php b/scripts/cycle_main.php
@@ -6,8 +6,6 @@
 include_once("./lib/loader.php");
 include_once("./lib/threads.php");
 
-set_time_limit(0);
-
 include_once("./load_settings.php");
 include_once(DIR_MODULES . "control_modules/control_modules.class.php");
 
@@ -53,7 +51,7 @@
 $started_time = time();
 
 echo date("H:i:s") . " running " . basename(__FILE__) . "\n";
-
+set_time_limit(0);
 while (1) {
     if (time() - $checked_time > 5) {
         $checked_time = time();

diff --git a/scripts/startup_maintenance.php b/scripts/startup_maintenance.php
@@ -1,14 +1,5 @@
 <?php
 
-/*
-chdir('../');
-include_once("./config.php");
-include_once("./lib/loader.php");
-
-
-$db=new mysql(DB_HOST, '', DB_USER, DB_PASSWORD, DB_NAME); // connecting to database
-include_once("./load_settings.php");
-*/
 /*
  * @version 0.1 (auto-set)
  */
@@ -18,6 +9,7 @@
     include_once("./config.php");
     include_once("./lib/loader.php");
     include_once("./load_settings.php");
+    set_time_limit(10 * 60);
 }
 
 if (isset($_SERVER['REQUEST_URI'])) {
@@ -26,8 +18,6 @@
     DebMes("Running from command line: " . implode(' ', $argv), 'maintenance');
 }
 
-set_time_limit(10 * 60);
-
 echo "<pre>\n";
 
 DebMes("Running maintenance script", 'maintenance');