X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=835eaa520108a5015b9238290436f1cf3b3df8e4;hb=850ef70d7d016480405e610bd698a4b0ffc8d6c7;hp=a2cf9f040096fde021aa4a1acb4512aaed2a4f7c;hpb=5572783b776137bfa7112828bbc245c6702774d7;p=gosa.git

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index a2cf9f040..835eaa520 100644
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -11,7 +11,6 @@ use Socket;
 use XML::Simple;
 use File::Spec;
 use Data::Dumper;
-use GOSA::DBsqlite;
 use MIME::Base64;
 
 my $event_dir = "/usr/lib/gosa-si/server/GosaPackages";
@@ -38,7 +37,7 @@ $main::server_address = $main::server_ip.":".$main::server_port;
 my ($error, $result, $event_hash) = &import_events($event_dir);
 foreach my $log_line (@$result) {
     if ($log_line =~ / succeed: /) {
-        &main::daemon_log("0 DEBUG: GosaPackages - $log_line", 7);
+        &main::daemon_log("0 INFO: GosaPackages - $log_line", 5);
     } else {
         &main::daemon_log("0 ERROR: GosaPackages - $log_line", 1);
     }
@@ -115,7 +114,7 @@ sub process_incoming_msg {
     my @msg_l;
     my @out_msg_l;
 
-    &main::daemon_log("$session_id DEBUG: GosaPackages: msg to process '$header'", 7);
+    &main::daemon_log("$session_id DEBUG: GosaPackages: msg to process '$header'", 26);
     
     if ($header =~ /^job_/) {
         @msg_l = &process_job_msg($msg, $msg_hash, $session_id);
@@ -168,7 +167,7 @@ sub process_gosa_msg {
     # check local installed events
     if( exists $event2module_hash->{$header} ) {
         # a event exists with the header as name
-        &main::daemon_log("$session_id INFO: found event '$header' at event-module '".$event2module_hash->{$header}."'", 5);
+        &main::daemon_log("$session_id DEBUG: found event '$header' at event-module '".$event2module_hash->{$header}."'", 26);
         no strict 'refs';
         @out_msg_l = &{$event2module_hash->{$header}."::$header"}( $msg, $msg_hash, $session_id );
 
@@ -186,8 +185,8 @@ sub process_gosa_msg {
             my $client_events = $res->{'1'}->{'events'};
 
             # client is registered for this event, deliver this message to client
-            if ($client_events =~ /,$header,/) {
-                &main::daemon_log("$session_id INFO: client '$target' is registerd for event '$header', forward message to client.", 5);
+            if (($client_events =~ /^$header,/) || ($client_events =~ /,$header,/) || ($client_events =~ /,$header$/)) {
+                &main::daemon_log("$session_id DEBUg: client '$target' is registerd for event '$header', forward message to client.", 26);
                 @out_msg_l = ( $msg );
 
             # client is not registered for this event, set error
@@ -204,11 +203,16 @@ sub process_gosa_msg {
         &main::daemon_log("$session_id ERROR: GosaPackages: no event handler or core function defined for '$header'", 1);
         @out_msg_l = ();
     } elsif ($out_msg_l[0] eq 'knownclienterror') {
-        &main::daemon_log("$session_id ERROR: no event handler found for '$header', check client registration events!", 1);
-        &main::daemon_log("$session_id ERROR: no or more than 1 hits are found at known_clients_db with sql query: '$sql_events'", 1);
-        &main::daemon_log("$session_id ERROR: processing is aborted and message will not be forwarded", 1);
+        if ($header eq "ping") {
+            &main::daemon_log("$session_id WARNING: Cannot send '$header' to '$target'. GOsa-si do not know client. Maybe client is offline or gosa-si-client process is not running.", 3);
+        } else {
+            &main::daemon_log("$session_id ERROR: no general event handler found for '$header', check client registration events!", 1);
+            &main::daemon_log("$session_id ERROR: no or more than 1 hits are found at known_clients_db with sql query: '$sql_events'", 1);
+            &main::daemon_log("$session_id ERROR: processing is aborted and message will not be forwarded", 1);
+        }
         @out_msg_l = ();
     } elsif ($out_msg_l[0] eq 'noeventerror') {
+        &main::daemon_log("$session_id ERROR: no general event handler found for '$header', check client registration events!", 1);
         &main::daemon_log("$session_id ERROR: client '$target' is not registered for event '$header', processing is aborted", 1); 
         @out_msg_l = ();
     }
@@ -247,6 +251,8 @@ sub process_job_msg {
             "<answer1>1</answer1>".
             "<error_string>no mac address specified, neither in target-tag nor in macaddres-tag</error_string>".
             "</xml>";
+
+        return ($out_msg);
     }
     
     # Determine plain_name for host
@@ -260,27 +266,41 @@ sub process_job_msg {
             $header = "trigger_action_reinstall"
         }
 
-    } else {   # Try to determine plain_name via ladp search
-        my $ldap_handle = &main::get_ldap_handle($session_id); 
-        if( not defined $ldap_handle ) {
-            &main::daemon_log("$session_id ERROR: cannot connect to ldap", 1);
-            $plain_name = "none"; 
+    } else {   # Try to determine plain_name via ldap search
+        my $ldap_handle=&main::get_ldap_handle();
+        my $mesg = $ldap_handle->search(
+                base => $main::ldap_base,
+                scope => 'sub',
+                attrs => ['cn'],
+                filter => "(macAddress=$macaddress)");
+        if($mesg->code || ($mesg->count!=1)) {
+            &main::daemon_log($mesg->error, 1);
+            $plain_name = "none";
         } else {
-            my $mesg = $ldap_handle->search(
-                    base => $main::ldap_base,
-                    scope => 'sub',
-                    attrs => ['cn'],
-                    filter => "(macAddress=$macaddress)");
-            if($mesg->code || ($mesg->count!=1)) {
-                &main::daemon_log($mesg->error, 1);
-                $plain_name = "none";
-            } else {
-                my $entry= $mesg->entry(0);
-                $plain_name = $entry->get_value("cn");
-            }
+            my $entry= $mesg->entry(0);
+            $plain_name = $entry->get_value("cn");
         }
+        &main::release_ldap_handle($ldap_handle);
     }
 	
+    # Check if it is a periodical job
+    my $periodic = 'none';
+    if (exists $msg_hash->{periodic})
+    {
+        $periodic = $msg_hash->{periodic}[0];
+        if ($periodic ne 'none' and not $periodic =~ /[0-9]+_(hours|minutes|days|weeks|months)/)    # Periodic tag is not valid
+        {
+            &main::daemon_log("$session_id ERROR: Message contains invalid periodic-tag '$periodic'.".
+                    " Please use the following pattern for the tag: 'INTEGER_[minutes|hours|days|weeks|months]'".
+                    " Aborted message: $msg", 1);
+            $out_msg = "<xml>".
+                "<header>answer</header><source>$main::server_address</source><target>GOSA</target>".
+                "<answer1>1</answer1><error_string>Message contains invalid periodic-tag '$periodic'</error_string>".
+                "</xml>";
+            return ($out_msg);
+        }
+    }
+
     # Add job to job queue
     if( $error == 0 ) {
         my $func_dic = {table=>$main::job_queue_tn, 
@@ -296,6 +316,7 @@ sub process_job_msg {
 			plainname=>$plain_name,
             siserver=>"localhost",
             modified=>"1",
+            periodic=>$periodic,
         };
         my $res = $main::job_db->add_dbentry($func_dic);
         if (not $res == 0) {