Updated strings

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index c721cd18f4f7900e5dffc8fa2f40444c132c78ef..a8e2bf2494da232ee7e6fd2f7d3f78a0aff5b837 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -143,6 +143,9 @@ our $messaging_tn = "messaging";
 our @messaging_col_names = ('subject', 'from', 'to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER', );
 my $messaging_file_name;
 
+# path to directory to store client install log files
+our $client_fai_log_dir = "/var/log/fai"; 
+
 %cfg_defaults = (
 "general" => {
     "log-file" => [\$log_file, "/var/run/".$prg.".log"],
@@ -584,7 +587,7 @@ sub input_from_known_client {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module) ) {
-        &daemon_log("DEBUG: Incoming message is not from a known client", 5);
+        &daemon_log("DEBUG: Incoming message is not from a known client", 7);
     }
 
     return ($msg, $msg_hash, $module);
@@ -763,6 +766,7 @@ sub get_ip {
        return $result;
 }
 
+
 sub get_local_ip_for_remote_ip {
        my $remote_ip= shift;
        my $result="0.0.0.0";
@@ -897,25 +901,19 @@ sub send_msg_to_target {
     return $error; 
 }
 
-###
-#
-#   HIER LÄUFT WAS SCHIEF - GENAU HIER KACK MIST
-#
-#   ERROR
-#
-#   TODO
-#
-###
+
 sub update_jobdb_status_for_send_msgs {
     my ($answer, $error) = @_;
     if( $answer =~ /<jobdb_id>(\d+)<\/jobdb_id>/ ) {
         my $jobdb_id = $1;
         if( $error ) {
-            # sending msg faild
-            my $sql_statement = "UPDATE $job_queue_tn ".
-                "SET status='error', result='can not deliver msg, please consult log file' ".
-                "WHERE id='$jobdb_id'";
-            my $res = $job_db->update_dbentry($sql_statement);
+            if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
+                # sending msg faild
+                my $sql_statement = "UPDATE $job_queue_tn ".
+                    "SET status='error', result='can not deliver msg, please consult log file' ".
+                    "WHERE id='$jobdb_id'";
+                my $res = $job_db->update_dbentry($sql_statement);
+            }
         } else {
             # sending msg was successful
             my $sql_statement = "UPDATE $job_queue_tn ".
@@ -948,7 +946,7 @@ sub client_input {
 
     daemon_log("", 5); 
     daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
-    daemon_log("DEBUG: Incoming message:\n$input", 9);
+    daemon_log("DEBUG: Incoming msg:\n$input", 9);
 
     ####################
     # check incoming msg
@@ -970,6 +968,7 @@ sub client_input {
     ######################
     # process incoming msg
     if( $error == 0) {
+        daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
         daemon_log("DEBUG: Processing module ".$module, 7);
         $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);