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

Changed status page to use config-check (tentative) and removed time-intensive check in index routing

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-16 16:15:16 -05:00
parent 2f0b3d423c
commit 44018b2cbf
5 changed files with 201 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

19
airtime_mvc/application/configs/config-check.php
View file

@ -28,6 +28,25 @@ $result = $r1 && $r2;
<link rel="stylesheet" type="text/css" href="css/bootstrap-3.3.1.min.css"> <link rel="stylesheet" type="text/css" href="css/bootstrap-3.3.1.min.css">
<link rel="stylesheet" type="text/css" href="css/setup/config-check.css"> <link rel="stylesheet" type="text/css" href="css/setup/config-check.css">
</head> </head>
<style>
/*
This is here because we're using the config-check css for
both this page and the system status page
*/
html {
background-color: #f5f5f5;
}
body {
padding: 2em 0;
min-width: 600px;
width: 50%;
text-align: center;
margin: 3em auto;
border: 1px solid lightgray;
border-radius: 5em;
}
</style>
<body> <body>
<h2> <h2>

7
airtime_mvc/application/controllers/SystemstatusController.php
View file

@ -13,16 +13,9 @@ class SystemstatusController extends Zend_Controller_Action
public function indexAction() public function indexAction()
{ {
$services = array(
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
);
$partitions = Application_Model_Systemstatus::GetDiskInfo(); $partitions = Application_Model_Systemstatus::GetDiskInfo();
$this->view->status = new StdClass; $this->view->status = new StdClass;
$this->view->status->services = $services;
$this->view->status->partitions = $partitions; $this->view->status->partitions = $partitions;
} }
} }

209
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View file

@ -1,33 +1,178 @@
<head>
<link rel="stylesheet" type="text/css" href="css/setup/config-check.css">
</head>
<?php
$phpDependencies = checkPhpDependencies();
$externalServices = checkExternalServices();
$zend = $phpDependencies["zend"];
$postgres = $phpDependencies["postgres"];
$database = $externalServices["database"];
$rabbitmq = $externalServices["rabbitmq"];
$pypo = $externalServices["pypo"];
$liquidsoap = $externalServices["liquidsoap"];
$mediamonitor = $externalServices["media-monitor"];
$r1 = array_reduce($phpDependencies, "booleanReduce", true);
$r2 = array_reduce($externalServices, "booleanReduce", true);
$result = $r1 && $r2;
?>
<table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable"> <table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
<thead> <thead>
<tr class="ui-state-default strong"> <tr class="ui-state-default strong">
<td><?php echo _("Service") ?></td> <td><?php echo _("Service") ?></td>
<td><?php echo _("Status") ?></td> <td><?php echo _("Description") ?></td>
<td><?php echo _("Uptime") ?></td> <td><?php echo _("Status") ?></td>
<td><?php echo _("CPU") ?></td> </tr>
<td><?php echo _("Memory") ?></td> </thead>
</tr> <tbody>
</thead> <!--
<tbody> <tr class="odd">
<!-- <td><?php echo sprintf(_("%s Version"), PRODUCT_NAME) ?></td>
<tr class="odd"> <td>1.9.3</td>
<td><?php echo sprintf(_("%s Version"), PRODUCT_NAME) ?></td> <td>&nbsp;</td>
<td>1.9.3</td> </tr>
<td>&nbsp;</td> -->
</tr> <tr>
--> <td class="component">
<?php $i=0; ?> Zend
<?php foreach($this->status->services as $key=>$value): ?> </td>
<tr class="<?php echo ($i&1) == 0 ? "even":"odd"; $i++; ?>" id="<?php echo $value["name"]; ?>"> <td class="description">
<td><?php echo $value["name"]; ?></td> Zend MVC Framework
<td><span></span></td> </td>
<td></td> <td class="solution <?php if ($zend) {echo 'check';?>">
<td></td> <?php
<td></td> } else {
</tr> ?>">
<?php endforeach; ?> <b>Ubuntu</b>: try running <code>sudo apt-get install libzend-framework-php</code>
<tr id="partitions" class="even"> <br/><b>Debian</b>: try running <code>sudo apt-get install zendframework</code>
<th colspan="5"><?php echo _("Disk Space") ?></th> <?php
</tr> }
</tbody> ?>
</table> </td>
</tr>
<tr>
<td class="component">
Postgres
</td>
<td class="description">
PDO and PostgreSQL libraries
</td>
<td class="solution <?php if ($postgres) {echo 'check';?>">
<?php
} else {
?>">
Try running <code>sudo apt-get install php5-pgsql</code>
<?php
}
?>
</td>
</tr>
<tr>
<td class="component">
Database
</td>
<td class="description">
Database configuration for Airtime
</td>
<td class="solution <?php if ($database) {echo 'check';?>">
<?php
} else {
?>">
Make sure you aren't missing any of the Postgres dependencies in the table above.
If your dependencies check out, make sure your database configuration settings in
<code>/etc/airtime.conf</code> are correct and the Airtime database was installed correctly.
<?php
}
?>
</td>
</tr>
<tr>
<td class="component">
RabbitMQ
</td>
<td class="description">
RabbitMQ configuration for Airtime
</td>
<td class="solution <?php if ($rabbitmq) {echo 'check';?>">
<?php
} else {
?>">
Make sure RabbitMQ is installed correctly, and that your settings in /etc/airtime/airtime.conf
are correct. Try using <code>sudo rabbitmqctl list_users</code> and <code>sudo rabbitmqctl list_vhosts</code>
to see if the airtime user (or your custom RabbitMQ user) exists, then checking that
<code>sudo rabbitmqctl list_exchanges</code> contains entries for airtime-media-monitor, airtime-pypo,
and airtime-uploads.
<?php
}
?>
</td>
</tr>
<tr>
<td class="component">
Media Monitor
</td>
<td class="description">
Airtime media-monitor service
</td>
<td class="solution <?php if ($mediamonitor) {echo 'check';?>">
<?php
} else {
?>">
Check that the airtime-media-monitor service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-media-monitor</code><br/>
If not, try <br/><code>sudo service airtime-media-monitor start</code>
<?php
}
?>
</td>
</tr>
<tr>
<td class="component">
Pypo
</td>
<td class="description">
Airtime playout service
</td>
<td class="solution <?php if ($pypo) {echo 'check';?>">
<?php
} else {
?>">
Check that the airtime-playout service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-playout</code><br/>
If not, try <br/><code>sudo service airtime-playout restart</code>
<?php
}
?>
</td>
</tr>
<tr>
<td class="component">
Liquidsoap
</td>
<td class="description">
Airtime liquidsoap service
</td>
<td class="solution <?php if ($liquidsoap) {echo 'check';?>">
<?php
} else {
?>">
Check that the airtime-liquidsoap service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-liquidsoap</code><br/>
If not, try <br/><code>sudo service airtime-liquidsoap restart</code>
<?php
}
?>
</td>
</tr>
<tr id="partitions" class="even">
<th colspan="5"><?php echo _("Disk Space") ?></th>
</tr>
</tbody>
</table>

14
airtime_mvc/public/css/setup/config-check.css
View file

@ -1,17 +1,3 @@
html {
background-color: #f5f5f5;
}
body {
padding: 2em 0;
min-width: 600px;
width: 50%;
text-align: center;
margin: 3em auto;
border: 1px solid lightgray;
border-radius: 5em;
}
.logo { .logo {
margin-bottom: .5em; margin-bottom: .5em;
} }

19
airtime_mvc/public/index.php
View file

@ -16,6 +16,11 @@ function showConfigCheckPage() {
die(); die();
} }
function isApiCall() {
$path = $_SERVER['PHP_SELF'];
return strpos($path, "api") !== false;
}
// Define application path constants // Define application path constants
define('ROOT_PATH', dirname( __DIR__) . '/'); define('ROOT_PATH', dirname( __DIR__) . '/');
define('LIB_PATH', ROOT_PATH . 'library/'); define('LIB_PATH', ROOT_PATH . 'library/');
@ -40,20 +45,6 @@ if (array_key_exists('config', $_GET)) {
// If a configuration file exists, forward to our boot script // If a configuration file exists, forward to our boot script
if (file_exists(AIRTIME_CONFIG_STOR . AIRTIME_CONFIG)) { if (file_exists(AIRTIME_CONFIG_STOR . AIRTIME_CONFIG)) {
/*
* Even if the user has been through the setup process and
* created an airtime.conf file (or they may have simply
* copied the example file) their settings aren't necessarily
* correctly configured.
*
* If something is improperly configured, show the user a
* configuration checklist page so they know what went wrong
*/
if (!checkConfiguration()) {
$configRun = true;
showConfigCheckPage();
}
require_once(APPLICATION_PATH . 'airtime-boot.php'); require_once(APPLICATION_PATH . 'airtime-boot.php');
} }
// Otherwise, we'll need to run our configuration setup // Otherwise, we'll need to run our configuration setup