X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=bcb62fd9ecc4f906d09a716608d43a2e75deb082;hb=9540255fc994b107abc71468c306d408e290d7bb;hp=1b55bbdc499e9140c042751df78f92d196b623b5;hpb=daa0ee497b124e472e51de36c9c78d59da02d71d;p=gosa.git diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 1b55bbdc4..bcb62fd9e 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -31,8 +31,8 @@ class gosaSupportDaemon private $s_error = ""; private $b_error = FALSE; - private $is_connected = FALSE; - + private $is_connected = FALSE; + private $is_configured = FALSE; protected $use_alternative_xml_parse_method = FALSE; public function get_host() @@ -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=10) + 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() @@ -70,7 +78,7 @@ class gosaSupportDaemon $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI")); $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI")); } - + $this->is_configured = TRUE; $this->f_timeout = $timeout; if($connect){ $this->connect(); @@ -79,6 +87,12 @@ class gosaSupportDaemon } + public function is_configured() + { + return($this->is_configured); + } + + /*! \brief Establish daemon connection. @return boolean Returns true if the connection was succesfully established. */ @@ -215,7 +229,7 @@ class gosaSupportDaemon $ret .= $msg." "; } } - $ret = preg_replace("/ /"," ",$ret); + $ret = str_replace(" "," ",$ret); return($ret); } @@ -1035,6 +1049,7 @@ class gosaSupportDaemon } @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, "".htmlentities($data)."", $info=""); + $start = microtime(1); /******* Start sending data @@ -1047,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, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "FAILED Duration:"); return($ret); } @@ -1054,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'])) { @@ -1078,6 +1103,8 @@ class gosaSupportDaemon array($data=>$data),"Fire & forget, not result.! ".$this->get_error()); } } + + @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "Duration:"); return($ret); } @@ -1123,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 @@ -1151,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{ @@ -1171,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; } @@ -1186,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("
gosa_ping
GOSA$target", TRUE); return (count($answer) ? TRUE:FALSE); } @@ -1491,7 +1521,7 @@ class gosaSupportDaemon */ public function krb5_get_policy($server,$name) { - $res = array(); + $ret = array(); /* Check if the given name is a valid request value */ @@ -1752,6 +1782,9 @@ class gosaSupportDaemon /* Get list of available log files */ + if(!is_array($entry)){ + $entry = array($entry); + } foreach($entry as $log_date){ $xml_msg2 = "
gosa_show_log_files_by_date_and_mac
@@ -1760,7 +1793,7 @@ class gosaSupportDaemon ".$log_date." ".$mac." "; - + $ret[$mac][$log_date] = array(); $res = $this->_send($xml_msg2,TRUE); $ret[$mac][$log_date]['DATE_STR'] = $log_date;