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

Merge pull request #1280 from jooola/enhance/api_client

Browse source 
Better error handling in api_client and airtime_mvc
This commit is contained in:
Kyle Robbertze 2021-08-05 15:20:54 +02:00 • committed by GitHub
commit 579dfe5b9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
airtime_mvc/application/controllers/ApiController.php
View file

@ -1427,7 +1427,16 @@ class ApiController extends Zend_Controller_Action
public function pushStreamStatsAction() {
$request = $this->getRequest();
$data = json_decode($request->getParam("data"), true);
$data_blob = $request->getParam("data");
$data = json_decode($data_blob, true);
if ($data === null && json_last_error() !== JSON_ERROR_NONE) {
$message = "An error occured while decoding the 'data' JSON blob: '$data_blob'";
Logging::error($message);
$this->jsonError(400, $message);
return;
}
Application_Model_ListenerStat::insertDataPoints($data);
$this->view->data = $data;
@ -1435,7 +1444,16 @@ class ApiController extends Zend_Controller_Action
public function updateStreamSettingTableAction() {
$request = $this->getRequest();
$data = json_decode($request->getParam("data"), true);
$data_blob = $request->getParam("data");
$data = json_decode($data_blob, true);
if ($data === null && json_last_error() !== JSON_ERROR_NONE) {
$message = "An error occured while decoding the 'data' JSON blob: '$data_blob'";
Logging::error($message);
$this->jsonError(400, $message);
return;
}
foreach ($data as $k=>$v) {
Application_Model_StreamSetting::SetListenerStatError($k, $v);
@ -1711,4 +1729,18 @@ class ApiController extends Zend_Controller_Action
// enable cors access from configured URLs
CORSHelper::enableCrossOriginRequests($request, $response);
}
/**
* Respond with a JSON error message with a custom HTTP status code.
*
* This logic should be handled by Zend, but I lack understanding of this
* framework, and prefer not break it or spend too much time on it.
*/
private final function jsonError($status, $message)
{
$this->getResponse()
->setHttpResponseCode($status)
->setHeader('Content-Type', 'application/json')
->setBody(json_encode(['error' => $message]));
}
}

7
python_apps/api_clients/api_clients/utils.py
View file

@ -95,7 +95,7 @@ class ApiRequest:
final_url = self.url.params(**kwargs).url()
self.logger.debug(final_url)
try:
if _post_data:
if _post_data is not None:
res = requests.post(
final_url,
data=_post_data,
@ -121,8 +121,9 @@ class ApiRequest:
raise
except requests.exceptions.HTTPError:
self.logger.error(
f"HTTP request to '{res.request.url}' failed"
f" with status '{res.status_code}':\n{res.text}"
f"{res.request.method} {res.request.url} request failed '{res.status_code}':"
f"\nPayload: {res.request.body}"
f"\nResponse: {res.text}"
)
raise