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

Slightly better error handling for uploads

This commit is contained in:
Albert Santoni 2015-11-13 10:53:47 -05:00
parent aa6f89d920
commit 591f7d59f0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/RabbitMq.php
View File

@ -141,7 +141,7 @@ class Application_Model_RabbitMq
$channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange); $channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange);
$msg = new AMQPMessage($jsonData, array('content_type' => 'text/plain')); $msg = new AMQPMessage($jsonData, array('content_type' => 'text/plain'));
$channel->basic_publish($msg, $exchange); $channel->basic_publish($msg, $exchange);
$channel->close(); $channel->close();
$conn->close(); $conn->close();

12
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -122,9 +122,8 @@ class Rest_MediaController extends Zend_Rest_Controller
->appendBody("ERROR: Disk Quota reached."); ->appendBody("ERROR: Disk Quota reached.");
} }
catch (Exception $e) { catch (Exception $e) {
$this->unknownErrorResponse(); $this->serviceUnavailableResponse();
Logging::error($e->getMessage()); Logging::error($e->getMessage() . "\n" . $e->getTraceAsString());
throw $e;
} }
} }
@ -209,5 +208,12 @@ class Rest_MediaController extends Zend_Rest_Controller
$resp->setHttpResponseCode(400); $resp->setHttpResponseCode(400);
$resp->appendBody("An unknown error occurred."); $resp->appendBody("An unknown error occurred.");
} }
private function serviceUnavailableResponse()
{
$resp = $this->getResponse();
$resp->setHttpResponseCode(400);
$resp->appendBody("An error occurred while processing your upload. Please try again in a few minutes.");
}
} }