Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-make rabbitmq_host configurable via $_SERVER var (.htaccess etc.)

This commit is contained in:
Martin Konecny 2012-01-11 16:28:03 -05:00
parent 4f546a1bc3
commit d1de836a92
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
airtime_mvc/application/models/Systemstatus.php
View File

@ -176,8 +176,14 @@ class Application_Model_Systemstatus
return $data; return $data;
} }
public static function GetRabbitMqStatus(){ public static function GetRabbitMqStatus(){
$docRoot = self::GetMonitStatus("localhost");
if (isset($_SERVER["RABBITMQ_HOST"])){
$rabbitmq_host = $_SERVER["RABBITMQ_HOST"];
} else {
$rabbitmq_host = "localhost";
}
$docRoot = self::GetMonitStatus($rabbitmq_host);
$data = self::ExtractServiceInformation($docRoot, "rabbitmq-server"); $data = self::ExtractServiceInformation($docRoot, "rabbitmq-server");
return $data; return $data;
@ -192,7 +198,7 @@ class Application_Model_Systemstatus
$storPath = Application_Model_MusicDir::getStorDir()->getDirectory(); $storPath = Application_Model_MusicDir::getStorDir()->getDirectory();
list($usedSpace,) = preg_split("/[\s]+/", exec("du -s $storPath")); list($usedSpace,) = preg_split("/[\s]+/", exec("du -bs $storPath"));
$partitions[$totalSpace]->totalSpace = $totalSpace; $partitions[$totalSpace]->totalSpace = $totalSpace;
$partitions[$totalSpace]->totalFreeSpace = $totalSpace - $usedSpace; $partitions[$totalSpace]->totalFreeSpace = $totalSpace - $usedSpace;