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

cc-4105: changed error handling from returning none to throwing exception

Browse source
This commit is contained in:
Rudi Grinberg 2012-07-16 14:58:23 -04:00
parent 3e24b71436
commit a9f6bb3b5c
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -543,15 +543,15 @@ class ApiController extends Zend_Controller_Action
public function reloadMetadataGroupAction() public function reloadMetadataGroupAction()
{ {
$request = $this->getRequest(); $request = $this->getRequest();
//extract all file metadata params from the request. // extract all file metadata params from the request.
//The value is a json encoded hash that has all the information related to this action // The value is a json encoded hash that has all the information related to this action
//The key does not have any meaning as of yet but it could potentially correspond // The key does not have any meaning as of yet but it could potentially correspond
//to some unique id. // to some unique id.
$responses = array(); $responses = array();
foreach ($request->getParams() as $k => $raw_json) { foreach ($request->getParams() as $k => $raw_json) {
$info_json = json_decode($raw_json, $assoc=true); $info_json = json_decode($raw_json, $assoc=true);
$mode = $info_json['mode']; $mode = $info_json['mode'];
unset($info_json['mode']); unset( $info_json['mode'] );
// TODO : uncomment the following line to actually do something // TODO : uncomment the following line to actually do something
// array_push($responses, $this->dispatchMetaDataAction($info_json, $info_json['mode'])); // array_push($responses, $this->dispatchMetaDataAction($info_json, $info_json['mode']));
// Like wise, remove the following line when done // Like wise, remove the following line when done

5
python_apps/api_clients/api_client.py
View file

@ -365,7 +365,6 @@ class AirTimeApiClient():
def send_media_monitor_requests(self, action_list, is_record=False): def send_media_monitor_requests(self, action_list, is_record=False):
logger = self.logger logger = self.logger
response = None
try: try:
url = self.construct_url('reload_metadata_group') url = self.construct_url('reload_metadata_group')
# We are assuming that action_list is a list of dictionaries such # We are assuming that action_list is a list of dictionaries such
@ -402,11 +401,11 @@ class AirTimeApiClient():
response = self.get_response_from_server(url) response = self.get_response_from_server(url)
response = json.loads(response) response = json.loads(response)
logger.info("associate recorded %s", response) logger.info("associate recorded %s", response)
return response
except Exception, e: except Exception, e:
response = None
logger.error('Exception: %s', e) logger.error('Exception: %s', e)
logger.error("traceback: %s", traceback.format_exc()) logger.error("traceback: %s", traceback.format_exc())
return response raise
#returns a list of all db files for a given directory in JSON format: #returns a list of all db files for a given directory in JSON format:
#{"files":["path/to/file1", "path/to/file2"]} #{"files":["path/to/file1", "path/to/file2"]}