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

Merge branch '2.3.x' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-03-05 16:21:47 -05:00
commit 1c80701488
10 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/common/DateHelper.php
View file

@ -229,7 +229,7 @@ class Application_Common_DateHelper
public static function calculateLengthInSeconds($p_time){
if (2 !== substr_count($p_time, ":")){
return FALSE;
return false;
}
if (1 === substr_count($p_time, ".")){
@ -241,12 +241,8 @@ class Application_Common_DateHelper
list($hours, $minutes, $seconds) = explode(":", $hhmmss);
// keep ms in 3 digits
$ms = substr($ms, 0, 3);
$totalSeconds = $hours*3600 + $minutes*60 + $seconds + $ms/1000;
return $totalSeconds;
$totalSeconds = ($hours*3600 + $minutes*60 + $seconds).".$ms";
return round($totalSeconds, 3);
}
public static function ConvertToUtcDateTime($p_dateString, $timezone=null){

5
airtime_mvc/application/models/RabbitMq.php
View file

@ -22,6 +22,11 @@ class Application_Model_RabbitMq
$CC_CONFIG["rabbitmq"]["user"],
$CC_CONFIG["rabbitmq"]["password"],
$CC_CONFIG["rabbitmq"]["vhost"]);
if (!isset($conn)) {
throw new Exception("Cannot connect to RabbitMQ server");
}
$channel = $conn->channel();
$channel->access_request($CC_CONFIG["rabbitmq"]["vhost"], false, false,
true, true);

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

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