Updated error handling

[gosa.git] / gosa-core / include / class_gosaSupportDaemon.inc

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 05817d193f7d32b2c8cc65a523ee8e718c386ee6..81272f9a4c5f4e808a7a9e7e685aca6df02eac93 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -56,10 +56,13 @@ class gosaSupportDaemon
   {
     #FIXME: bad idea about referencing global variables from within classes
     global $config;
+    if(!isset($config) || !$config){
+      $config = session::global_get('config');
+    }
 
     // Detect timeout 
     if($timeout == null){
-      $timeout = $config->get_cfg_value("gosaSupportTimeout",15);
+      $timeout = $config->get_cfg_value("core","gosaSupportTimeout");
     }
 
     /* This should only be the case if we call this from setup.
@@ -68,12 +71,12 @@ class gosaSupportDaemon
     if(!is_object($config)) { return; }
 
     # load from config, store statically
-    if ($config->get_cfg_value("gosaSupportURI") != ""){
+    if ($config->get_cfg_value("core","gosaSupportURI") != ""){
 
       if ($this->s_host == ""){
-        $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("gosaSupportURI"));
-        $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI"));
-        $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI"));
+        $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
+        $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
+        $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
       }
       $this->is_configured = TRUE;
       $this->f_timeout = $timeout;
@@ -1046,6 +1049,7 @@ class gosaSupportDaemon
     }
     @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<i>".htmlentities($data)."</i>", $info="");
 
+    $start = microtime(1);
 
     /*******
       Start sending data 
@@ -1058,6 +1062,7 @@ class gosaSupportDaemon
         /* Check if something went wrong while reading */
         if($this->o_sock->is_error()){
           $this->set_error($this->o_sock->get_error());
+          @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, sprintf('%.7f', microtime(1) - $start) , "<b>FAILED Duration:</b>");
           return($ret);
         }
 
@@ -1065,10 +1070,19 @@ class gosaSupportDaemon
         if(isset($entries['XML']) && is_array($entries['XML'])){
           $ret = $entries;
           if($this->use_alternative_xml_parse_method) {
+
+            // --------- Seems broken, check for 'ERROR' but using 'ERROR_STRING'
             if(isset($entries['XML'][0]['ERROR'][0]['VALUE']) && $entries['XML'][0]['ERROR'][0]['VALUE'] == "1"){
               $this->set_error($entries['XML'][0]['ERROR_STRING'][0]['VALUE']);
               new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", 
                   array($data=>$data),"FAILED ".$this->get_error());
+            // ---------
+      
+          
+            }elseif(isset($entries['XML'][0]['ERROR'][0]['VALUE'])){
+              $this->set_error($entries['XML'][0]['ERROR'][0]['VALUE']);
+              new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", 
+                  array($data=>$data),"FAILED ".$this->get_error());
             }
           }else{
             if(isset($entries['XML']['ERROR_STRING'])) {
@@ -1089,6 +1103,8 @@ class gosaSupportDaemon
             array($data=>$data),"Fire & forget, not result.! ".$this->get_error());
       }
     }
+
+    @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, sprintf('%.7f', microtime(1) - $start) , "<b>Duration:</b>");
     return($ret);
   }
 
@@ -1134,6 +1150,9 @@ class gosaSupportDaemon
   function clean_queue_from_mac($mac)
   {
     global $config;
+    if(!isset($config) || !$config){
+      $config = session::global_get('config');
+    }
 
     /* First of all we have to check which jobs are startet 
      *  for $mac 
@@ -1162,7 +1181,7 @@ class gosaSupportDaemon
                 $tmp->add_targets(array($mac));
                 $tmp->set_type(TRIGGERED_EVENT);
                 if(!$this->append($tmp)){
-                  msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"),$entry['ID']) , ERROR_DIALOG);
+                  msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
                   new log("debug","DaemonEvent ", "gosaSupportDaemon::clean_queue_from_mac()", array($mac => $mac),
                       "FAILED, could not send 'DaemonEvent_faireboot' for entry ID (".$entry['ID'].") - ".$this->get_error());
                 }else{
@@ -1182,7 +1201,7 @@ class gosaSupportDaemon
                *  Failed or waiting events, can be removed without any trouble.
                */ 
               if(!$this->remove_entries(array($entry['ID']))){
-                msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"),$entry['ID']) , ERROR_DIALOG);
+                msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
               }
               ;break;
           }