* closes #487

 * correct DEBUG/ERROR status in log line

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

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 120be07348b44cd0d7747059ad892a50cd3ef64d..8944c1a0aa276898643bd8e0cfac20838ec9f375 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -1102,13 +1102,12 @@ daemon_log("INFO: gosa-si-client mac address detected: $client_mac_address", 1);
 # import events
 my ($error, $result, $tmp_hash) = &import_events($event_dir);
 $event_hash = $tmp_hash;
-if ($error == 0) {
-    foreach my $log_line (@$result) {
-        daemon_log("DEBUG: $log_line", 7);
-    }
-} else {
-    foreach my $log_line (@$result) {
-        daemon_log("ERROR: $log_line", 1);
+
+foreach my $log_line (@$result) {
+    if ($log_line =~ / succeed: /) {
+        &main::daemon_log("0 DEBUG: $log_line", 7);
+    } else {
+        &main::daemon_log("0 ERROR: $log_line", 1);
     }
 }
 

diff --git a/gosa-si/modules/ClientPackages.pm b/gosa-si/modules/ClientPackages.pm
index dfd104a05b3a42efed03ceaf2a2ef7c4d6b6f05f..b7d87a42d33158e1cdc67a9976c965330b3ff315 100644 (file)
--- a/gosa-si/modules/ClientPackages.pm
+++ b/gosa-si/modules/ClientPackages.pm
@@ -60,15 +60,13 @@ $main::server_mac_address= &get_mac($network_interface);
 
 # import local events
 my ($error, $result, $event_hash) = &import_events($event_dir);
-if ($error == 0) {
-    foreach my $log_line (@$result) {
+
+foreach my $log_line (@$result) {
+    if ($log_line =~ / succeed: /) {
         &main::daemon_log("0 DEBUG: ClientPackages - $log_line", 7);
-    }
-} else {
-    foreach my $log_line (@$result) {
+    } else {
         &main::daemon_log("0 ERROR: ClientPackages - $log_line", 1);
     }
-
 }
 
 # Unit tag can be defined in config

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 5f6b4657ba4edc65801888fd70498656cc1704b3..5791a318eb9fd1d4392f6e43b2da8793fc700782 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -57,12 +57,11 @@ my $xml = new XML::Simple();
 
 # import local events
 my ($error, $result, $event_hash) = &import_events($event_dir);
-if ($error == 0) {
-    foreach my $log_line (@$result) {
+
+foreach my $log_line (@$result) {
+    if ($log_line =~ / succeed: /) {
         &main::daemon_log("0 DEBUG: GosaPackages - $log_line", 7);
-    }
-} else {
-    foreach my $log_line (@$result) {
+    } else {
         &main::daemon_log("0 ERROR: GosaPackages - $log_line", 1);
     }
 }

diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm
index b33a4987953a2882324e6de02cf92f50cc7757d2..ca0a1c8b70ce79663b509659f291c360005be489 100644 (file)
--- a/gosa-si/modules/ServerPackages.pm
+++ b/gosa-si/modules/ServerPackages.pm
@@ -21,12 +21,10 @@ END {}
 
 # import local events
 my ($error, $result, $event_hash) = &import_events($event_dir);
-if ($error == 0) {
-    foreach my $log_line (@$result) {
+foreach my $log_line (@$result) {
+    if ($log_line =~ / succeed: /) {
         &main::daemon_log("0 DEBUG: ServerPackages - $log_line", 7);
-    }
-} else {
-    foreach my $log_line (@$result) {
+    } else {
         &main::daemon_log("0 ERROR: ServerPackages - $log_line", 1);
     }
 }