Changeset 250

Timestamp:

06/05/07 17:10:46 (1 year ago)

Author:

ludo

Message:

lsc: task kill now working, directory upload, i18n fixes, tasks can be scheduled even with no ping. (from r4467)

Files:

• trunk/webmin/lsc/command_detail.php (modified) (3 diffs)
• trunk/webmin/lsc/command_history_detail.php (modified) (3 diffs)
• trunk/webmin/lsc/command_on_host_detail.php (modified) (8 diffs)
• trunk/webmin/lsc/connection_error.cgi (modified) (2 diffs)
• trunk/webmin/lsc/include/command_launcher.inc.php (modified) (6 diffs)
• trunk/webmin/lsc/include/commands.inc.php (modified) (1 diff)
• trunk/webmin/lsc/include/commands_on_host.inc.php (modified) (6 diffs)
• trunk/webmin/lsc/include/exec.inc.php (modified) (3 diffs)
• trunk/webmin/lsc/include/file.inc.php (modified) (1 diff)
• trunk/webmin/lsc/include/scheduler.inc.php (modified) (1 diff)
• trunk/webmin/lsc/include/ssh.inc.php (modified) (7 diffs)
• trunk/webmin/lsc/include/widget.inc.php (modified) (3 diffs)
• trunk/webmin/lsc/killparent.sh (added)
• trunk/webmin/lsc/lang/en (modified) (1 diff)
• trunk/webmin/lsc/lang/fr (modified) (1 diff)
• trunk/webmin/lsc/open_session.inc.php (modified) (2 diffs)
• trunk/webmin/lsc/repository.cgi (modified) (5 diffs)
• trunk/webmin/lsc/start_command_on_host.php (modified) (1 diff)
• trunk/webmin/lsc/tmpl/en/command_detail_page.tpl (modified) (3 diffs)
• trunk/webmin/lsc/tmpl/en/command_on_host_detail_page.tpl (modified) (4 diffs)
• trunk/webmin/lsc/tmpl/en/connection_error_page.tpl (modified) (1 diff)
• trunk/webmin/lsc/tmpl/en/home_group_and_profile_page.tpl (modified) (1 diff)
• trunk/webmin/lsc/tmpl/en/home_one_host_page.tpl (modified) (2 diffs)
• trunk/webmin/lsc/tmpl/en/widget_where_I_m_connected.tpl (modified) (1 diff)
• trunk/webmin/lsc/tmpl/en/widget_where_I_m_connected_group_and_profile.tpl (modified) (1 diff)
• trunk/webmin/lsc/tmpl/fr/command_detail_page.tpl (modified) (2 diffs)
• trunk/webmin/lsc/tmpl/fr/command_on_host_detail_page.tpl (modified) (3 diffs)
• trunk/webmin/lsc/tmpl/fr/home_one_host_page.tpl (modified) (2 diffs)
• trunk/webmin/lsc/xprobe_safe (added)

trunk/webmin/lsc/command_detail.php

@@ -78 +78 @@
- */
-$query="SELECT
-à 
-à 
-à 
+
+
+
-        title,
-        start_file,
@@ -121 +121 @@
-        $template->set_var("COMMAND_PATH_SOURCE",$database->f("path_source"));
-        if ($database->f("create_directory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
-        if ($database->f("start_script")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
@@ -146 +146 @@
-        
-        if ($database->f("start_inventory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-
-        if ($database->f("wake_on_lan")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }       
-        

trunk/webmin/lsc/command_history_detail.php

@@ -83 +83 @@
- */
-$query="SELECT
-à 
-à 
-à 
+
+
+
-        title,
-        start_file,
@@ -124 +124 @@
-        $template->set_var("COMMAND_PATH_SOURCE",$database->f("path_source"));
-        if ($database->f("create_directory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
-        if ($database->f("start_script")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
@@ -149 +149 @@
-        
-        if ($database->f("start_inventory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-
-        if ($database->f("wake_on_lan")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }       
-        

trunk/webmin/lsc/command_on_host_detail.php

@@ -85 +85 @@
-SELECT
-        id_command,
+        DATE_FORMAT(next_launch_date, '%d-%m-%Y %H:%i:%s'),
-        current_state,
-        uploaded,
-        executed,
-        deleted,
-
+
+
-FROM
-        ".COMMANDS_ON_HOST_TABLE."
@@ -123 +125 @@
-}
-
+$template->set_var("COMMAND_RUN_DATE", $database->f(1));
-$template->set_var("UPLOADED_ICON", return_icon($database->f("uploaded")));
-$template->set_var("EXECUTED_ICON", return_icon($database->f("executed")));
@@ -129 +132 @@
-$template->set_var("EXECUTED", $text[$database->f("executed")]);
-$template->set_var("DELETED", $text[$database->f("deleted")]);
+$template->set_var("ATTEMPTS", $database->f("number_attempt_connection_remains"));
-
-switch ($database->f("current_state")) {
@@ -228 +232 @@
- */
-$query="SELECT
-à 
-à 
-à 
+
+
+
-        title,
-        start_file,
@@ -249 +253 @@
-        webmin_username
-FROM
-
+ 
-WHERE
-
+ 
-";
-
@@ -272 +276 @@
-        $template->set_var("COMMAND_PATH_SOURCE",$database->f("path_source"));
-        if ($database->f("create_directory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
-        if ($database->f("start_script")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-        
@@ -294 +298 @@
-                $template->set_var("COMMAND_END_DATE",$database->f(2));
-        }
+
-        $template->set_var("COMMAND_TARGET",$database->f("target"));
-        
-        if ($database->f("start_inventory")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }
-
-        if ($database->f("wake_on_lan")=="enable") {
-"oui"
-
-"non"
+$text{"yes"}
+
+$text{"no"}
-        }       
-        
@@ -344 +349 @@
-SELECT
-        id_command_history,
-Ã  
+
-        state,
-        stderr,

trunk/webmin/lsc/connection_error.cgi

@@ -40 +40 @@
-
-if ($session->ping_error) {
-"échec"
-"non testé"
-"non testé"
+$text{"failed"}
+$text{"not_tested"}
+$text{"not_tested"}
-        $template->set_var("SSH_COMMAND", "");
-        $template->set_var("SSH_RETURN_VAL", "");
@@ -48 +48 @@
-        
-} else {
-"succès"
+$text{"success"}
-        if ($session->error_ssh_failed) {
-"échec"
-"non testé"
+$text{"failed"}
+$text{"not_tested"}
-        } else {
-"succès"
+$text{"success"}
-        
-"échec"
-"succès"
+$text{"failed"}
+$text{"success"}
-        }
-

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

@@ -187 +187 @@
-                        
-                        // Launch $start_command
-                        
-                        unset($output);unset($return_var);unset($return_var);unset($stdout);unset($stderr);
-                        lsc_ssh(
@@ -394 +393 @@
-                                return;
-                        }
+                }
+                
+                /* No OS detected yet, let's retry */
+                if ($this->command->path_destination == "") {
+                        debug(2, "LSC_Command_Launcher->execute: os detect");
+                        $this->session->initialize_os_type();
+                        $this->command->path_destination = $this->session->tmp_path;
+                        debug(2, "LSC_Command_Launcher->execute: path=".$this->session->tmp_path);
-                }
-                
@@ -536 +543 @@
-                        lsc_command_on_host_set_current_state($this->id_command_on_host, "done");
-                }
+
+                /* handle repeats */
+                $this->repeat_resched();
-        }
-
@@ -551 +561 @@
-                
-                $mac = get_mac_address_from_full_hostname($this->command_on_host->host);
-
+
+
-                if ( $mac != "" ) {
-lsc_command_on_host_get_remains_connection_attempt($this->id_command_on_host)
+$coh->number_attempt_connection_remains
-                        while($remains_connection_attempt > 0) {
-
-
-
-
-
-
+
+
+
+
-                                        return 0;
-                                }
@@ -634 +643 @@
-                                if ($this->command_on_host->next_launch_date == "0000-00-00 00:00:00") {
-                                        lsc_command_on_host_set_next_launch_date($this->id_command_on_host, date("Y-m-d H:i:s"));
+                                } 
+
+                                if ($remains_connection_attempt > 0) {
+                                        /* more attempts: schedule a retry */
+                                        $coh->update_next_launch_date(
+                                                "next_launch_date + interval ".intval($this->command->next_connection_delay)." minute"
+                                        );
+                                } else {
+                                        /* no more attempts remaining, check if periodic */
+                                        $this->repeat_resched();
-                                }
-
-
-
-
-
-
+
-                                return -1;                                      
-                                
@@ -668 +682 @@
-        }
-        
+        /* check if a task is periodic, and reschedule it */
+        function repeat_resched()
+        {
+                $coh = $this->command_on_host;
+                
+                if ($this->command->repeat == 0) {
+                        return;
+                }
+                if ($coh->end_date != "0000-00-00 00:00:00") {
+                        if (strtotime($coh->end_date) < time()) {
+                                /* stop after end date */
+                                return;
+                        }
+                }
+                /* to re-schedule: next_date = start_date + interval */
+                $coh->update_next_launch_date("start_date + interval 30 minute");
+                $coh->start_date = $coh->next_launch_date;
+                $coh->number_attempt_connection_remains = $this->command->max_connection_attempt;
+                $coh->current_state = "scheduled";
+                $coh->uploaded = "TODO";
+                $coh->executed = "TODO";
+                $coh->deleted = "TODO";
+                $coh->update();
+                /* should set state done if next > end_date */
+        }
+        
+        /* wake on lan */
-        function wake_on_lan_mac($mac)
-        {

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

@@ -763 +763 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-

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

@@ -39 +39 @@
-        var $deleted;                           /**< is command deleted ? */
-        var $next_launch_date;                  /**< when this command will be started (YYYY-MM-DD HH:MM:SS) */
-TODO
+number of attempts
-        var $next_attempt_date_time;            /**< php time function value */
-        var $current_pid = -1;
@@ -401 +401 @@
-
-        /**
+        * Adjust next launch date
+        *
+        * @param $id_command_on_host
+        * @param new next attempt date time value
+        *
+        */
+        function update_next_launch_date($date) {
+                global $database;
+
+                $query = sprintf("UPDATE %s
+                        SET next_launch_date = %s
+                        WHERE id_command_on_host = \"%s\" ",
+                        COMMANDS_ON_HOST_TABLE,
+                        $date,
+                        $this->id_command_on_host
+                );
+                
+                $database->query($query);
+                $this->refresh();
+        }
+        /**
-         * Return in array command history of current command on host
-         *
@@ -692 +713 @@
-}
-
-/**
- * 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)
-{
@@ -956 +944 @@
-                %s
-        SET
-
-
+
-        WHERE
-                id_command_on_host = \"%s\" and
@@ -1003 +990 @@
-        $database->next_record();
-        $current_state = $database->f("current_state");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        UPDATE
-                %s
@@ -1027 +1003 @@
-                current_pid = \"-1\"
-        WHERE
-
-
+
-                        COMMANDS_ON_HOST_TABLE,
-                        $id_command_on_host

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

@@ -48 +48 @@
-{
-        $keychain = get_keychain();
-
-        $ssh_command ="$keychain ssh -o StrictHostKeyChecking=no -o Batchmode=yes -o PasswordAuthentication=no ".$user."@".$ip." \"".$command."\" 2>&1";
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        
-        $handle = popen($ssh_command, "r");
@@ -76 +66 @@
-                }
-        }
-
-
-
-
+
-        $stdout = $output;
-
+
+
-        $command = $ssh_command;
-}
@@ -90 +78 @@
-function lsc_scp($user, $ip, $source, $destination, &$output, &$return_var, &$stdout, &$stderr, &$scp_command)
-{
-
+ -r
-
-        $destination = ereg_replace(" ", "\\ ", $destination);

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

@@ -1113 +1113 @@
-
-/**
-e
+
- */
-function LSC_fileSend($session, $path)

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

@@ -223 +223 @@
-                        "0000-00-00 00:00:00",
-                        "root",
-
+."@".$_SERVER['REMOTE_ADDR']
-                        $desc,
-                        false,

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

@@ -118 +118 @@
-                /* safe defaults */
-                $this->root_path = CYGWIN_WINDOWS_ROOT_PATH;
-
-
-
+
+
+
+
-                $this->mac = $mac;
-
+d
-
-                /* Load ether file */
@@ -187 +188 @@
-                         $ls_command = "ls ".MOUNT_EXPLORER."/".$this->user."@".$this->ip."/";
-                         
-
-
-
+
-                                $ls_command, 
-                                $this->ssh_array_output, 
@@ -208 +207 @@
-                 }
-                
-
-
+. Not Used
+/* 
-                        $this->home = $this->LSC_getHomePath();
-                } else {
-                        $this->home = $home;
-
+*/
-                
-                debug(1, sprintf("User home path : %s", $this->home));
@@ -399 +398 @@
-        function initialize_os_type($known_type = "")
-        {
+                global $config;
+                
-                $random = mt_rand();
-                if ($known_type === false) {
@@ -405 +406 @@
-                if ($known_type == "") {
-                        unset($output); unset($return_var); unset($stdout); unset($stderr);
-xprobe2 -M 6 ".$this->ip." 2>&1"
+./xprobe_safe ".$this->ip
-                        $key = LSC_arrayEreg("Running OS", $output);
-                        $type = $output[$key];
@@ -411 +412 @@
-                        $type = $known_type;
-                }
+                debug(2, "OS Type:".$type);
-                if ( strpos ( $type, "Windows" ) !== FALSE) {
-                        $this->platform = "Windows";
+                        $this->tmp_path = $config[path_destination];
-                        return;
-                } elseif ( strpos ( $type, "Linux" ) !== FALSE) {
@@ -420 +423 @@
-                        return;
-                }
-
+
+
-        }
-

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

@@ -457 +457 @@
-        ));
-
-
+_ha
-        foreach( $script_list as $script ) {
-                $template->set_var("FILENAME", $script["filename"]);
-                $template->set_var("TITLE", isset($script["title".$lang]) ? $script["title".$lang] : $script["title"]);
-
+_ha
-        }
-
@@ -604 +604 @@
-        
-        if ($command->create_directory_enable) {
-é
-
-ésactivé
+?
+
+?sactiv?
-        }
-        
-        if ($command->start_script_enable) {
-é
-
-ésactivé
+?
+
+?sactiv?
-        }
-        
@@ -944 +944 @@
-        
-        if ($command->create_directory_enable) {
-é
-
-ésactivé
+?
+
+?sactiv?
-        }
-        
-        if ($command->start_script_enable) {
-é
-
-ésactivé
+?
+
+?sactiv?
-        }
-        

trunk/webmin/lsc/lang/en

@@ -57 +57 @@
-success=success
-failed=failed
+not_tested=not tested

trunk/webmin/lsc/lang/fr

@@ -57 +57 @@
-success=succès
-failed=échoué
+not_tested=pas testé

trunk/webmin/lsc/open_session.inc.php

@@ -14 +14 @@
-         * Open the session
-         */
+                
-        if ($_COOKIE["session"][$getmac]["platform"]!="") {
-                $session = new LSC_Session(
@@ -23 +24 @@
-                );
-        } else {
-
+
+
+
-        }
-        

trunk/webmin/lsc/repository.cgi

@@ -246 +246 @@
-        
-        foreach($_POST["select_to_copy"] as $i) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                if ( $_POST["select_to_execute"] == $i ) {
-                        $start_file = $item;