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

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

Browse source 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
drigato 2014-11-18 09:24:38 -05:00
commit 4d8b32556b
122 changed files with 33988 additions and 22602 deletions
Download patch file Download diff file Expand all files Collapse all files

11
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
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
@ -98,13 +99,13 @@ def send_http_request(picklable_request, retry_queue):
if not isinstance(picklable_request, PicklableHttpRequest):
raise TypeError("picklable_request must be a PicklableHttpRequest. Was of type " + type(picklable_request).__name__)
try:
t = threading.Timer(60, alert_hung_request)
t.start()
#t = threading.Timer(60, alert_hung_request)
#t.start()
bare_request = picklable_request.create_request()
s = requests.Session()
prepared_request = s.prepare_request(bare_request)
r = s.send(prepared_request, timeout=StatusReporter._HTTP_REQUEST_TIMEOUT)
t.cancel() # Watchdog no longer needed.
r = s.send(prepared_request, timeout=StatusReporter._HTTP_REQUEST_TIMEOUT, verify=False) # SNI is a pain in the ass
#t.cancel() # Watchdog no longer needed.
r.raise_for_status() # Raise an exception if there was an http error code returned
logging.info("HTTP request sent successfully.")
except requests.exceptions.HTTPError as e:
@ -140,7 +141,7 @@ def is_web_server_broken(url):
caused by Airtime or the webserver itself being broken temporarily.
'''
try:
test_req = requests.get(url)
test_req = requests.get(url, verify=False)
test_req.raise_for_status()
except Exception as e:
return True