bugfix: 10 sec timeout while server-server communication, forward_to_gosa-tag was...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12157 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 814a7c05f543c5dc63a6adf7ce26ab2affd567b3..787b7ce00c51bed47a66b6562855a53b7962afbe 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -129,13 +129,6 @@ sub process_incoming_msg {
             $out_msg =~ s/<source>GOSA<\/source>/<source>$act_server_ip:$main::server_port<\/source>/g;
         }
 
-        # Patch the correct outgoing forward_to_gosa address
-        #if ($out_msg =~ /<forward_to_gosa>(\S+),(\d+)<\/forward_to_gosa>/ ) {
-        #    $out_msg =~ s/<forward_to_gosa>\S+<\/forward_to_gosa>/<forward_to_gosa>$act_server_ip:$main::server_port,$session_id<\/forward_to_gosa>/;
-        #} else {
-        #    $out_msg =~ s/<\/xml>/<forward_to_gosa>$act_server_ip:$main::server_port,$session_id<\/forward_to_gosa> <\/xml>/;
-        #}
-
         # Add to each outgoing message the current POE session id
         $out_msg =~ s/<\/xml>/<session_id>$session_id<\/session_id><\/xml>/;
 
@@ -184,7 +177,7 @@ sub process_gosa_msg {
 
             # client is registered for this event, deliver this message to client
             if ($client_events =~ /,$header,/) {
-                &daemon_log("$session_id INFO: client '$target' is registerd for event '$header', forward message to client.", 5);
+                &main::daemon_log("$session_id INFO: client '$target' is registerd for event '$header', forward message to client.", 5);
                 @out_msg_l = ( $msg );
 
             # client is not registered for this event, set error