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

Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
This commit is contained in:
Albert Santoni 2014-11-12 17:04:00 -05:00
commit 864352c6a7
2 changed files with 2 additions and 1 deletions

View file

@ -85,6 +85,7 @@ def process_http_requests(ipc_queue, http_retry_queue_path):
# while the web server is down or unreachable.
with open(http_retry_queue_path, 'wb') as pickle_file:
pickle.dump(retry_queue, pickle_file)
return
except Exception as e: # Terrible top-level exception handler to prevent the thread from dying, just in case.
if shutdown:
return