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

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

Conflicts:
	python_apps/airtime_analyzer/setup.py
This commit is contained in:
drigato 2014-11-12 14:51:18 -05:00
parent c132cac43d 95517cac87
commit f1fa4929ae
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$file->setDbFilepath($requestData["filename"]); $file->setDbFilepath($requestData["filename"]);
$fileSizeBytes = $requestData["filesize"]; $fileSizeBytes = $requestData["filesize"];
if ($fileSizeBytes === false) if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{ {
$file->setDbImportStatus(2)->save(); $file->setDbImportStatus(2)->save();
$this->fileNotFoundResponse(); $this->fileNotFoundResponse();
@ -242,7 +242,7 @@ class Rest_MediaController extends Zend_Rest_Controller
//we should get rid of this since we're removing local file storage //we should get rid of this since we're removing local file storage
} else if (isset($requestData["full_path"])) { } else if (isset($requestData["full_path"])) {
$fileSizeBytes = filesize($requestData["full_path"]); $fileSizeBytes = filesize($requestData["full_path"]);
if ($fileSizeBytes === false) if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{ {
$file->setDbImportStatus(2)->save(); $file->setDbImportStatus(2)->save();
$this->fileNotFoundResponse(); $this->fileNotFoundResponse();

5
python_apps/airtime_analyzer/setup.py
View File

@ -30,6 +30,11 @@ setup(name='airtime_analyzer',
'python-daemon', 'python-daemon',
'requests', 'requests',
'apache-libcloud', 'apache-libcloud',
# These next 3 are required for requests to support SSL with SNI. Learned this the hard way...
# What sucks is that GCC is required to pip install these.
#'ndg-httpsclient',
#'pyasn1',
#'pyopenssl'
], ],
zip_safe=False, zip_safe=False,
data_files=data_files) data_files=data_files)