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

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
parent aff6104839 2d20e58c91
commit 864352c6a7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -237,7 +237,7 @@ class Rest_MediaController extends Zend_Rest_Controller
//as a foreign key to cc_music_dirs.
if (isset($requestData["full_path"])) {
$fileSizeBytes = filesize($requestData["full_path"]);
if ($fileSizeBytes === false)
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{
$file->setDbImportStatus(self::IMPORT_STATUS_FAILED)->save();
$this->fileNotFoundResponse();

1
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