Updated base check

[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 cd9f53787b650cad1ca0221ee90b47ab488088b8..3a7d09ce4365793cfab00b120f92e54893d34566 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -52,10 +52,18 @@ class gosaSupportDaemon
     @param boolean  Connect Directly connect to daemon socket.
     @param float    Timeout The timelimit for all socket actions.
    */
-  public function __construct($connect=TRUE,$timeout=15)
+  public function __construct($connect=TRUE,$timeout=null)
   {
     #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);
+    }
 
     /* This should only be the case if we call this from setup.
         __autoload() 
@@ -1041,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 
@@ -1053,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);
         }
 
@@ -1060,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'])) {
@@ -1084,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);
   }
 
@@ -1129,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 
@@ -1192,7 +1216,7 @@ class gosaSupportDaemon
   {
     if (tests::is_mac($target)){
       /* Get communication object */
-      $d= new gosaSupportDaemon(TRUE,0.5);
+      $d= new gosaSupportDaemon(TRUE,2);
       $answer= $d->_send("<xml><header>gosa_ping</header><source>GOSA</source><target>$target</target></xml>", TRUE);
       return (count($answer) ? TRUE:FALSE);
     }