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

Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer

Browse source
This commit is contained in:
Albert Santoni 2014-04-21 17:50:34 -04:00
commit f65e7dd721
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/UpgradeController.php
View file

@ -18,7 +18,7 @@ class UpgradeController extends Zend_Controller_Action
} }
//Begin upgrade //Begin upgrade
$filename = "/etc/airtime/airtime.conf"; $filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
$values = parse_ini_file($filename, true); $values = parse_ini_file($filename, true);
$username = $values['database']['dbuser']; $username = $values['database']['dbuser'];

3
airtime_mvc/application/models/StoredFile.php
View file

@ -393,9 +393,8 @@ SQL;
if (file_exists($filepath) && $type == "stor") { if (file_exists($filepath) && $type == "stor") {
$data = array("filepath" => $filepath, "delete" => 1);
try { try {
Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data); unlink($filepath);
} catch (Exception $e) { } catch (Exception $e) {
Logging::error($e->getMessage()); Logging::error($e->getMessage());
return; return;