Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
Albert Santoni 2014-04-02 16:48:04 -04:00
commit aabb8ec01f
2 changed files with 52 additions and 32 deletions

View file

@ -116,8 +116,9 @@ class MessageListener:
# TODO: If the JSON was invalid or the web server is down,
# then don't report that failure to the REST API
#TODO: Catch exceptions from this HTTP request too:
StatusReporter.report_failure_to_callback_url(callback_url, api_key, import_status=2,
reason=u'An error occurred while importing this file')
if callback_url: # If we got an invalid message, there might be no callback_url in the JSON
StatusReporter.report_failure_to_callback_url(callback_url, api_key, import_status=2,
reason=u'An error occurred while importing this file')
else: