Merge branch '2.3.x' into devel

This commit is contained in:
Martin Konecny 2013-03-05 16:21:22 -05:00
commit cc69418215
29 changed files with 218 additions and 169 deletions

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;
}
}