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

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-11-18 12:38:18 -05:00
commit 965a78c54a
16 changed files with 191 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -136,9 +136,8 @@ class Rest_MediaController extends Zend_Rest_Controller
->appendBody("ERROR: Disk Quota reached.");
}
catch (Exception $e) {
$this->unknownErrorResponse();
Logging::error($e->getMessage());
throw $e;
$this->serviceUnavailableResponse();
Logging::error($e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@ -249,5 +248,12 @@ class Rest_MediaController extends Zend_Rest_Controller
$resp->setHttpResponseCode(400);
$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.");
}
}