Changeset 238

Timestamp:

04/16/07 12:34:00 (2 years ago)

Author:

ludo

Message:

do not sleep between retries: reschedule (from r4250)

Files:

• trunk/webmin/lsc/debian/changelog (modified) (1 diff)
• trunk/webmin/lsc/images/icon-menu.gif (modified) (previous)
• trunk/webmin/lsc/include/command_launcher.inc.php (modified) (3 diffs)
• trunk/webmin/lsc/include/commands.inc.php (modified) (2 diffs)
• trunk/webmin/lsc/include/commands_on_host.inc.php (modified) (3 diffs)
• trunk/webmin/lsc/include/scheduler.inc.php (modified) (3 diffs)
• trunk/webmin/lsc/module.info (modified) (1 diff)

trunk/webmin/lsc/debian/changelog

@@ -1 @@
-4
+5
-
-  * See SVN history

trunk/webmin/lsc/include/command_launcher.inc.php

@@ -563 +563 @@
-                                        return 0;
-                                }
+                                
+                                /* Check if next_attempt is not properly initialized (pre 1.0.3 transition) */
+                                if ($this->command_on_host->next_launch_date == "0000-00-00 00:00:00" &&
+                                    $this->command_on_host->start_date != "0000-00-00 00:00:00" ) {
+                                
+                                        lsc_command_on_host_set_next_launch_date($this->id_command_on_host, $this->command_on_host->start_date);
+                                        return(0);
+                                }
+                                
-                                $this->session = new LSC_Session($mac, $this->command->username);
-                                        
@@ -577 +586 @@
-                                                );
-                                                return 0;
-                                        } else {
-                                                lsc_command_on_host_set_current_state(
-                                                        $this->id_command_on_host,
-                                                        "not_reachable"
-                                                );
-                                                lsc_command_history_append(
-                                                        $this->id_command_on_host,
-                                                        date("Y-m-d H:i:s"),
-                                                        "not_reachable",
-                                                        $this->session->ssh_stderr,
-                                                        $this->session->msgerror
-                                                );
-                                                return -1;
-                                        }
-                                } else {
-                                        /*
-
+Ping error: 
-                                         */
-                                        if ($this->command->wake_on_lan_enable) {
@@ -611 +607 @@
-                                                }
-                                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        return -1;

trunk/webmin/lsc/include/commands.inc.php

@@ -386 +386 @@
-                                        $new_command_on_host->start_date = $this->start_date;
-                                        $new_command_on_host->end_date = $this->end_date;
+                                        $new_command_on_host->next_launch_date = $this->start_date;
-
-                                        // Initialise field
@@ -394 +395 @@
-                                        $new_command_on_host->current_pid = -1;
-
-                                        $new_command_on_host->next_launch_date = "0000-00-00 00:00:00";
-                                        
-                                        $new_command_on_host->number_attempt_connection_remains = $this->max_connection_attempt;

trunk/webmin/lsc/include/commands_on_host.inc.php

@@ -378 +378 @@
-                        $this->executed = $database->f("executed");
-                        $this->deleted = $database->f("deleted");
-
-                        $this->next_launch_date = $database->f("next_launch_date");
+                        
-                } else if ($database->num_rows() == 0) {
-                        return -1;
@@ -659 +659 @@
-}
-
+/**
+ * Set next launch date
+ *
+ * @param $id_command_on_host
+ * @param new next attempt date time value
+ *
+ */
+function lsc_command_on_host_set_next_launch_date($id_command_on_host, $new_date_time)
+{
+        global $database, $DEBUG;
+
+        if (!isset($database)) {
+                $database = new LSC_DB();
+                if ($DEBUG >= 1) $database->Debug = true;
+        }
+
+        $query = sprintf(
+"
+        UPDATE
+                %s
+        SET
+                next_launch_date = '%s'
+        WHERE
+                id_command_on_host = \"%s\"
+",
+                COMMANDS_ON_HOST_TABLE,
+                $new_date_time,
+                $id_command_on_host
+        );
+        
+        $database->query($query);
+}
+
+/**
+ * Adjust next launch date
+ *
+ * @param $id_command_on_host
+ * @param new next attempt date time value
+ *
+ */
+function lsc_command_on_host_adjust_next_launch_date($id_command_on_host, $new_date_time)
+{
+        global $database, $DEBUG;
+
+        if (!isset($database)) {
+                $database = new LSC_DB();
+                if ($DEBUG >= 1) $database->Debug = true;
+        }
+
+        $query = sprintf(
+"
+        UPDATE
+                %s
+        SET
+                next_launch_date = next_launch_date %s
+        WHERE
+                id_command_on_host = \"%s\"
+",
+                COMMANDS_ON_HOST_TABLE,
+                $new_date_time,
+                $id_command_on_host
+        );
+        
+        $database->query($query);
+}
+
-function lsc_command_on_host_set_current_state($id_command_on_host, $new_state)
-{
@@ -686 +752 @@
-        $database->query($query);
-}
+
-
-/**

trunk/webmin/lsc/include/scheduler.inc.php

@@ -314 +314 @@
-                        $query = sprintf("
-                                SELECT
-start
+next_launch
-                                FROM
-                                        %s A,
@@ -332 +332 @@
-                                        NOT (A.current_state = \"inventory_failed\") and
-                                        (A.number_attempt_connection_remains > 0) and
-
+
+
-                                ORDER BY
-                                        B.date_created ASC
@@ -348 +349 @@
-                                // Iterate all command to dispatch
-                                while ( $database->next_record() ) {
-                                        /*
-                                         * Test if start_date < now < end_date
-                                         */
-                                        if ($database->f("start_date") != "0000-00-00 00:00:00") {
-                                                if (strtotime($database->f("start_date"))>time()) {
-                                                        debug(1, "Run start_date > now for ".$database->f("id_command_on_host"));
-                                                        continue;
-                                                }
-                                        }
-
-                                        $start_command = "cd ".dirname(__FILE__)."/../;./phprun.sh \"./start_command_on_host.php -id_command_on_host ".$database->f("id_command_on_host")."\" > /dev/null & echo \$!";

trunk/webmin/lsc/module.info

@@ -3 +3 @@
-desc_fr=LRS : Prise de Contrôle à Distance Sécurisé
-depends=1.030 lbs_common
-4
+5