diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index cd9f53787b650cad1ca0221ee90b47ab488088b8..bcb62fd9ecc4f906d09a716608d43a2e75deb082 100644 (file)
@param boolean Connect Directly connect to daemon socket.
@param float Timeout The timelimit for all socket actions.
*/
@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;
{
#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()
/* This should only be the case if we call this from setup.
__autoload()
}
@DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<i>".htmlentities($data)."</i>", $info="");
}
@DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<i>".htmlentities($data)."</i>", $info="");
+ $start = microtime(1);
/*******
Start sending data
/*******
Start sending data
/* Check if something went wrong while reading */
if($this->o_sock->is_error()){
$this->set_error($this->o_sock->get_error());
/* 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);
}
return($ret);
}
if(isset($entries['XML']) && is_array($entries['XML'])){
$ret = $entries;
if($this->use_alternative_xml_parse_method) {
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());
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'])) {
}
}else{
if(isset($entries['XML']['ERROR_STRING'])) {
array($data=>$data),"Fire & forget, not result.! ".$this->get_error());
}
}
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);
}
return($ret);
}
function clean_queue_from_mac($mac)
{
global $config;
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
/* First of all we have to check which jobs are startet
* for $mac
$tmp->add_targets(array($mac));
$tmp->set_type(TRIGGERED_EVENT);
if(!$this->append($tmp)){
$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{
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{
* Failed or waiting events, can be removed without any trouble.
*/
if(!$this->remove_entries(array($entry['ID']))){
* 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;
}
}
;break;
}
{
if (tests::is_mac($target)){
/* Get communication object */
{
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);
}
$answer= $d->_send("<xml><header>gosa_ping</header><source>GOSA</source><target>$target</target></xml>", TRUE);
return (count($answer) ? TRUE:FALSE);
}