bugfix: daemon_log

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index b9a1cc6d662507f53cb537a5ec6ca165f66403f6..c923354ea61bf5f11012b48f7ef98129ba566f49 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -113,7 +113,7 @@ our $known_clients_db;
 "bus" =>
     {"bus_activ" => [\$bus_activ, "on"],
     "bus_passwd" => [\$bus_passwd, ""],
-    "bus_ip" => [\$bus_ip, ""],
+    "bus_ip" => [\$bus_ip, "0.0.0.0"],
     "bus_port" => [\$bus_port, "20080"],
     },
 "server" =>
@@ -129,7 +129,7 @@ our $known_clients_db;
     },
 "gosa" =>
     {"gosa_activ" => [\$gosa_activ, "on"],
-    "gosa_ip" => [\$gosa_ip, ""],
+    "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
     "gosa_port" => [\$gosa_port, "20082"],
     "gosa_passwd" => [\$gosa_passwd, "none"],
     },
@@ -167,10 +167,11 @@ EOF
 sub read_configfile {
     my $cfg;
     if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+        print STDERR ">>>>>>>>>>>>>>><$cfg_file\n";
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {
-            print STDERR "Couldn't read config file!";
+            print STDERR "Couldn't read config file!\n";
         }
     } else {
         $cfg = Config::IniFiles->new() ;
@@ -216,11 +217,10 @@ sub daemon_log {
                 my $name = $0;
                 $name =~ s/\.\///;
 
-                print LOG_HANDLE "$month $monthday $hours:$minutes:$seconds $name $msg\n";
-                if($foreground) { print $msg."\n" }
+                print LOG_HANDLE "\n$month $monthday $hours:$minutes:$seconds $name $msg";
             }
+        close( LOG_HANDLE );
     }
-#    close( LOG_HANDLE );
 #log into syslog
 #    my ($msg, $level, $facility) = @_;
 #    if(not defined $msg) {return}
@@ -491,7 +491,8 @@ sub get_processing_child {
  
                    if (defined $answer) {
                         print $PARENT_wr $answer."\n";
-                        daemon_log("with answer:", 5);
+                        my $len_answer = length $answer;
+                        daemon_log("with answer: length of answer: $len_answer", 5);
                         daemon_log("$answer", 5);
                     } else {
                         print $PARENT_wr "done"."\n";

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 18423d87b2501b3859a6dae871a09beea3321490..7d1bda9ddf8948c24f7b85a3f68c46db146cffbb 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -42,7 +42,7 @@ my %cfg_defaults =
     },
 "gosa" =>
     {"gosa_activ" => [\$gosa_activ, "on"],
-    "gosa_ip" => [\$gosa_ip, ""],
+    "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
     "gosa_port" => [\$gosa_port, "20082"],
     "gosa_passwd" => [\$gosa_passwd, "none"],
     },

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 3ccd88d5f3fbe9d3a25d813cc1b6c85df1fb4e5e..1d93746de0585e85157b269dbeb438b4ce585c29 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -4,7 +4,7 @@
 require_once("../../gosa-core/include/class_socketClient.inc");
 error_reporting(E_ALL);
 
-$sock = new Socket_Client("10.89.1.156","20082",TRUE,1);
+$sock = new Socket_Client("127.0.0.1","20082",TRUE,1);
 #$sock = new Socket_Client("169.254.2.248","9999",TRUE,1);
 $sock->setEncryptionKey("secret-gosa-password");
 
@@ -15,7 +15,7 @@ if($sock->connected()){
        #$data = "<xml><header>gosa_ping</header><source>10.89.1.155:20082</source><target>10.89.1.155:20080</target></xml>";
        #$data = "<xml> <header>job_ping</header> <source>10.89.1.155:20083</source><mac>00:1B:77:04:8A:6C</mac> <timestamp>19700101000000</timestamp> </xml>";
        #$data = "<xml> <header>job_sayHello</header> <source>10.89.1.155:20083</source><mac>00:1B:77:04:8A:6C</mac> <timestamp>20130102133900</timestamp> </xml>";
-       $data = "<xml> <header>job_ping</header> <source>10.89.1.155:20083</source><mac>00:1B:77:04:8A:6C</mac> <timestamp>20130102133900</timestamp> </xml>";
+       #$data = "<xml> <header>job_ping</header> <source>10.89.1.155:20083</source><mac>00:1B:77:04:8A:6C</mac> <timestamp>20130102133900</timestamp> </xml>";
 
 # delete
        #$data = "<xml> <header>gosa_delete_jobdb_entry</header> <where>headertag</where> <headertag>sayHello</headertag> </xml>";
@@ -26,7 +26,7 @@ if($sock->connected()){
        #$data = "<xml> <header>gosa_update_timestamp_jobdb_entry</header> <update> <timestamp>20130123456789</timestamp> </update></xml>";
 
 # query
-       #$data = "<xml><header>gosa_query_jobdb</header><where>status</where><status>waiting</status></xml>";
+       $data = "<xml><header>gosa_query_jobdb</header><where>status</where><status>waiting</status></xml>";
        
 # clear
        #$data = "<xml> <header>gosa_clear_jobdb</header> </xml>";