Commit Graph

775 Commits

Author SHA1 Message Date
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 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
drigato 01ad2ab832 Commented cloud storage classes 2014-10-29 17:42:42 -04:00
drigato 7edd993fa3 Reverted pypo's copy file method to how it was without cloud files
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
drigato 9726fb80d2 Removed amazon s3 signature from pypo cache file name.
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
drigato 544d20ebc2 Replaced spaces with dashes in resource_id generation
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
drigato a10e287368 Fixed a fresh install bug that wasn't using composer installs.
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
drigato 2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04:00
drigato 52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
drigato ead4a3c565 Corrected false comment about how pypo fetches the schedule 2014-08-14 12:48:31 -04:00
drigato e5881f2530 Corrected false comment about how pypo fetches the schedule 2014-08-14 12:29:52 -04:00
drigato 879e776c8d CC-5888: Handle file deletion if the file is stored in the cloud 2014-08-12 12:32:49 -04:00
drigato 6545828dc7 Removed exiting pypo if error occurs during cloud storage downloads 2014-08-11 12:25:30 -04:00
drigato dd37ffbdd7 CC-5888: Handle file deletion if the file is stored in the cloud
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
drigato 8c2754972e CC-5896: Store cloud files in separate table, inherited from cc_files
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
Albert Santoni c09457ce7c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-07-16 15:03:39 -04:00
Albert Santoni 490a9c0d06 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-07-15 16:46:20 -04:00
Albert Santoni 7438ecd2b4 Use track metadata from Airtime in playout engine
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
  along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
drigato 039a51121b CC-5885: Factor out cloud storage code into separate class 2014-07-11 16:16:30 -04:00
drigato 6f119b006f CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:58:00 -04:00
drigato e6bbf8e84c CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:57:38 -04:00
drigato c2411b6f41 CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:56:41 -04:00
cliffctwang 3c40c6d627 Merge branch '2.5.x' into 2.5.x-saas 2014-03-21 09:46:30 -04:00
cliff.wang b827321093 cc-5747 Replaygain: doesnt work for aac tracks 2014-03-20 13:02:37 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 73cbead4c3 CC-5729: Pypo race condition on show source kick event kills playout
* Fixed a race condition in pypo which could kill playout. Input kick
  events and non-file/webstream events could result in an exception
  being thrown. Fixed the logic error behind this, caught the exception
  just in case, and added some code to prevent uncaught pypopush
  exceptions from terminating the thread.
* Could prevent playout breakage in similar situations
2014-03-11 18:01:29 -04:00
Albert Santoni 02a96646e1 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	python_apps/pypo/listenerstat.py
2014-02-05 17:35:59 -05:00
Albert Santoni b4e7b9324b Fixed listener stats thread hanging on network errors
* Same fix as before, urlopen() wasn't being used with a timeout.
* Fixes CC-5472 and SAAS-394 aka. listener stats breaking all the time
2014-02-05 17:29:15 -05:00
Albert Santoni dfc4c2f308 SAAS-387: Hunt playout freezes
* Really kill hung pyponotify processes.
2014-02-05 12:20:04 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
Naomi 2ab269dd29 CC-5299 : Back to back record shows doesn't work with some devices
waiting until the ecasound process has completed before starting a new recording thread.
2013-10-15 14:31:06 -04:00
Naomi f91cb39e46 CC-5363 : pushing a file twice, noticeable replaygain switch 2013-10-11 17:05:42 -04:00
Albert Santoni f34a6d201a Double the pypo->liquidsoap timeout on second attempt if first attempt failed 2013-10-07 15:39:14 -04:00
Albert Santoni 02101db088 Raise timeout for pypo->liquidsoap communication to improve reliability under load 2013-10-07 15:37:34 -04:00
Naomi a34ae69d4b CC-5347 : Random Error think to do with updating is scheduled status of a webstream
not sending a notify message if webstream source is -1
2013-09-30 15:56:26 -04:00
Naomi 9f38e5a9c6 CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page 2013-09-26 17:03:18 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
cliff.wang 12a62a3827 CC-5309:Calendar-> Recording Show: Fail to open context menu
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
cliff.wang ceba84d1f7 CC-5308 Liquidsoap input habor will block schedule contents sometime
Remove makesafe wrapper
2013-08-22 15:03:25 -04:00
denise 694e3101a8 Merge branch '2.4.x' into 2.4.x-saas 2013-07-22 11:02:35 -04:00
denise de76b3a12f CC-5278: Exception in Pypo 2013-07-17 15:29:21 -04:00
denise 18bb477845 Merge branch '2.4.x' into 2.4.x-saas 2013-07-10 11:32:51 -04:00
denise f9a1cae72e CC-5260: Liquidsoap: Fail to play mono file
Fixed thanks to Bill Burton
2013-07-10 10:35:24 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
Martin Konecny c11021af0f remove commented code 2013-06-14 16:36:47 -04:00