drigato
57868d2351
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-10 12:47:22 -05:00
drigato
d73b331376
SAAS-515: Prefix object names with station name
2014-12-10 12:40:08 -05:00
drigato
89925e52ed
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
drigato
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
drigato
2c760f4ba6
Changed how PYPO's download URL is created
2014-12-08 14:47:23 -05:00
drigato
687548ec68
Adding some logging statements
2014-12-08 14:24:19 -05:00
drigato
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
drigato
2ae45bd005
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-03 14:42:10 -05:00
drigato
53624d8d28
SAAS-503: PYPO -> Use the REST API to download filesSAAS-503
...
Added python library - requests - to pybundle
2014-12-03 14:41:16 -05:00
drigato
cf9eabbc74
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/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
drigato
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
drigato
432245b18e
SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
...
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
drigato
92feacd46f
SAAS-501: Re-jig cloud_storage.conf
2014-11-27 15:50:40 -05:00
drigato
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
drigato
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
Albert Santoni
cbb8ac7dc6
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-18 17:45:00 -05:00
Albert Santoni
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
drigato
2cfe08b33a
Updated FTP upload hook script with new vhost.map file location
2014-11-18 14:58:27 -05:00
drigato
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
Albert Santoni
32bdbe1ad6
Improved some comments
2014-11-14 11:12:10 -05:00
Albert Santoni
71f2cc11d2
Fix for incorrect watchdog disabling
2014-11-12 17:04:21 -05:00
Albert Santoni
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -05:00
Albert Santoni
8eaeaf71f9
airtime_analyzer status_reporter shutdown fix
2014-11-12 17:01:59 -05:00
Albert Santoni
aff6104839
Disable airtime_analyzer watchdog
2014-11-12 16:12:33 -05:00
drigato
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
drigato
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
drigato
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
Albert Santoni
24cae3b3d6
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 18:41:26 -05:00
Albert Santoni
b324031ee6
Disable those new requirements because pip requires gcc to install them
2014-11-11 18:41:09 -05:00
drigato
90ff323d1d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 14:00:37 -05:00
drigato
dbc55632e1
Changed print statements so they go to the pypo log
2014-11-11 13:58:55 -05:00
drigato
49f3881da0
rmq_config_path fix
2014-11-11 13:56:02 -05:00
drigato
eb0f12c709
Change back rabbitmq config file param name
2014-11-11 13:55:46 -05:00
Albert Santoni
024923ba6a
Disable SSL verification for SaaS as a temporary workaround
2014-11-11 12:18:20 -05:00
Albert Santoni
5f27e3099a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 11:19:31 -05:00
Albert Santoni
63b357f0ee
Updated requirements for airtime_analyzer to make python-requests
...
support SNI properly
2014-11-11 11:18:55 -05:00
drigato
41acfd3840
rmq_config_path fix
2014-11-10 12:35:41 -05:00
drigato
413c7fd604
Change back rabbitmq config file param name
2014-11-10 12:25:40 -05:00
drigato
da42e39178
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:49:27 -05:00
drigato
ecc0225ff5
Added apache-libcloud dependency to airtime_analyzer
2014-11-07 12:49:10 -05:00
drigato
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
drigato
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
drigato
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
drigato
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
drigato
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
drigato
7e1d14fcf2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-11-03 10:31:49 -05:00
drigato
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
Duncan Sommerville
ef9ab1acf0
Merge branch '2.5.x' into saas
2014-10-30 17:42:55 -04:00
Duncan Sommerville
8f5af6556d
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
2014-10-30 17:41:00 -04:00
