tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix-hostlist-test-4516' 

fixes #4516
This commit is contained in:
Johannes Meyer 2013-08-06 14:06:43 +02:00
parent 7ba6d4a74f 584198f00c
commit 1b9885f274
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/Icinga/Protocol/Commandpipe/CommandPipe.php
View File

@ -647,42 +647,6 @@ class CommandPipe
);
}
/**
* Start obsessing over provided services/hosts
*
* @param array $objects An array of hosts and/or services
*/
public function startObsessing($objects)
{
foreach ($objects as $object) {
$type = $this->getObjectType($object);
$msg = "START_OBSESSING_OVER_". (($type == self::TYPE_SERVICE) ? 'SVC' : 'HOST');
$msg .= ';'.$object->host_name;
if ($type == self::TYPE_SERVICE) {
$msg .= ';'.$object->service_description;
}
$this->send($msg);
}
}
/**
* Stop obsessing over provided services/hosts
*
* @param array $objects An array of hosts and/or services
*/
public function stopObsessing($objects)
{
foreach ($objects as $object) {
$type = $this->getObjectType($object);
$msg = "STOP_OBSESSING_OVER_". (($type == self::TYPE_SERVICE) ? 'SVC' : 'HOST');
$msg .= ';'.$object->host_name;
if ($type == self::TYPE_SERVICE) {
$msg .= ';'.$object->service_description;
}
$this->send($msg);
}
}
/**
* Send a custom host or service notification
*

2
modules/monitoring/test/php/application/controllers/ListControllerHostTest.php
View File

@ -29,7 +29,7 @@ class ListControllerHostMySQLTest extends MonitoringControllerTest
public function executeHostListTestFor($backend)
{
date_default_timezone_set('UTC');
$checkTime = time()-2000;
$checkTime = (string)(time()-2000);
$fixture = new TestFixture();
$firstHostFlags = ObjectFlags::PASSIVE_ONLY();
$firstHostFlags->acknowledged = 1;