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:
commit
f1fa4929ae
|
@ -227,7 +227,7 @@ class Rest_MediaController extends Zend_Rest_Controller
|
|||
$file->setDbFilepath($requestData["filename"]);
|
||||
|
||||
$fileSizeBytes = $requestData["filesize"];
|
||||
if ($fileSizeBytes === false)
|
||||
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
|
||||
{
|
||||
$file->setDbImportStatus(2)->save();
|
||||
$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
|
||||
} else if (isset($requestData["full_path"])) {
|
||||
$fileSizeBytes = filesize($requestData["full_path"]);
|
||||
if ($fileSizeBytes === false)
|
||||
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
|
||||
{
|
||||
$file->setDbImportStatus(2)->save();
|
||||
$this->fileNotFoundResponse();
|
||||
|
|
|
@ -30,6 +30,11 @@ setup(name='airtime_analyzer',
|
|||
'python-daemon',
|
||||
'requests',
|
||||
'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,
|
||||
data_files=data_files)
|
||||
|
|
Loading…
Reference in New Issue