702de0f5f5
SAAS-602: Fix getaddrinfo deadlock (again)
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-02-24 13:14:21 -05:00
8aaf300491
Attempt a workaround for unicode hostname resolution deadlock in the
...
analyzer
2015-02-23 18:22:16 -05:00
58f9ffd0eb
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
2015-02-19 15:40:27 -05:00
b6acfb2dce
SAAS-596: Store file size and hash in database
...
Renamed metadata md5 value to match cc_files column
2015-02-19 15:39:55 -05:00
6ef085f460
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-19 11:43:34 -05:00
0f921cb481
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
2015-02-19 10:51:53 -05:00
cc9e6efbca
SAAS-596: Store file size and hash in database
...
Removed try/except while getting file size and hash
2015-02-19 10:38:30 -05:00
70f5bd3748
Fixed the unit tests
2015-02-19 10:17:42 -05:00
d0bd4bfe81
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 19:29:45 -05:00
5bd3371ec2
SAAS-596: Store file size and hash in database
...
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
2015-02-17 16:51:25 -05:00
c1086842d3
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -05:00
66a6a8f985
SAAS-596: Store file size and hash in database
...
Added file size and hash to the metadata dict in the analyzer
2015-02-17 16:02:49 -05:00
d8f5e41fca
Set a connection timeout for Boto to prevent cloud storage deadlock
2015-02-17 14:58:19 -05:00
cee0ff4881
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
2015-02-05 14:31:20 -05:00
6cfac054ca
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Renamed the analyzer config variables to be named specially for rabbitmq
config
2015-02-05 10:14:35 -05:00
e6171680ad
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Small fix
2015-02-04 14:34:04 -05:00
c6fc184559
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-04 13:36:35 -05:00
7b3f9af04c
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
2015-02-03 15:55:47 -05:00
7808fd4708
More analyzer log statements
2015-02-03 13:54:25 -05:00
3127507124
Analyzer log statements for debugging
2015-02-03 13:21:07 -05:00
58b7080a84
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into saas
2015-02-02 13:32:08 -05:00
e32a26956b
Fixed the unit tests again
2015-02-02 13:31:52 -05:00
2793509781
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-02 13:17:26 -05:00
9baed1b328
Make the unit tests pass again
2015-02-02 13:14:14 -05:00
536094ea50
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-02-02 13:05:32 -05:00
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
9e963ed023
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-02 12:27:01 -05:00
ee6862e731
Fixed quotation issue with playability analyzer
2015-02-02 12:26:22 -05:00
3f6983aa3e
Renabling CuePointAnalyzer
2015-02-02 12:18:33 -05:00
3f97ed3d55
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-27 16:46:06 -05:00
ea868607b4
Enabling cuepoint analyzer because the silan bug has been fixed
2015-01-27 16:44:21 -05:00
102c78474d
Enabling cuepoint analyzer because the silan bug has been fixed
2015-01-27 13:21:44 -05:00
43c6475f1b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-26 09:18:32 -05:00
6adaf7a91a
Disabling cue point analyzer
2015-01-26 09:17:53 -05:00
a686eabb96
Disabling cue point analyzer
2015-01-23 17:33:57 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
6ebe8ec6c8
Pin python-daemon to 1.6 because 2.0.3 breaks setuptools
2015-01-22 12:42:05 -05:00
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
38a2924849
SAAS-555: Analyzer calculates wrong cue out
2015-01-22 11:08:34 -05:00
7930ae97ae
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-15 17:23:15 -05:00
29c5cf5de0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-15 17:21:26 -05:00
52a66632c6
SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
...
Fix unit tests
2015-01-15 17:17:29 -05:00
f8ce7110ee
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-15 13:46:26 -05:00
89e760fd98
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-15 13:45:40 -05:00
7d0f1655d2
SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
2015-01-15 13:44:48 -05:00
02e4c18931
SAAS-531: Finalize S3 folder hierarchy
2015-01-12 14:50:42 -05:00
ad16683858
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-07 14:17:02 -05:00
9d6cf8620f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-07 14:16:09 -05:00
08738cf391
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-01-06 15:46:20 -05:00
Albert Santoni
drigato