Commit Graph

982 Commits

Author SHA1 Message Date
Albert Santoni 3996e757b7 Merge branch 'saas-dev' into saas-installer-albert 2015-06-10 12:02:08 -04:00
Albert Santoni 146146e35f CC-6052: Fix problem with stream passwords 2015-06-08 14:18:19 -04:00
Albert Santoni 01ea6f27ae Merge branch 'saas-dev' into saas-installer-albert
Conflicts:
	python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
Albert Santoni 700fddbada SAAS-818: If the network connection is interrupted, pypo sometimes can't recover 2015-06-02 14:51:20 -04:00
drigato 532bd1ea85 SAAS-772: Send metadata to Tunein
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
Albert Santoni 6fad0a3ee6 Merge branch 'saas-dev' into saas-installer-albert 2015-05-22 19:09:30 -04:00
Albert Santoni fc02de4920 Revert "Add on_metadata wrapper to liquidsoap master/show sources"
This reverts commit 415a0d21f9.
2015-05-22 19:09:04 -04:00
Albert Santoni d3f89c9507 Revert "Add on_metadata wrapper to liquidsoap master/show sources"
This reverts commit 82c801cb79.
2015-05-22 19:08:48 -04:00
Albert Santoni 9ffbdfbfa3 Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 18:43:28 -04:00
Albert Santoni b81069ace3 Added missing requests dependency to pypo's requirements 2015-05-22 18:43:05 -04:00
Albert Santoni 6ca0e340a4 Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
	python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni 027adc7749 Three bugfixes
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni 11c6818e61 Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
Duncan Sommerville 196e08fc90 Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap 2015-05-21 12:49:26 -04:00
Duncan Sommerville 415a0d21f9 Add on_metadata wrapper to liquidsoap master/show sources 2015-05-15 15:46:45 -04:00
Duncan Sommerville 82c801cb79 Add on_metadata wrapper to liquidsoap master/show sources 2015-05-15 15:15:49 -04:00
drigato e2ca218ac2 Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player 2015-03-23 15:54:04 -04:00
Albert Santoni cca9ba0c36 Fixed pypo config file loading 2015-03-12 19:09:00 -04:00
Albert Santoni b49e98693b Ignore artist_name and track_titles that aren't strings (fixes playout
for empty artist name or track titles)
2015-03-12 10:52:28 -04:00
Albert Santoni a29d464eb2 SAAS-642: Files with doublequotes in their track titles fail to playout
(pypo->LS communication bug)

* Fixed it by escaping the command
2015-03-11 18:34:50 -04:00
Albert Santoni 0042fb50fe Refactor some stuff related to four streams, Liquidsoap is a piece of
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
Albert Santoni 6232e3f4f0 Better backwards compatibility fix for 4 streams 2015-03-10 12:52:00 -04:00
Albert Santoni 968b739bf4 Make 4th stream backwards compatible with the autogenerated
liquidsoap.cfg
2015-03-10 12:41:45 -04:00
Albert Santoni d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -05:00
Albert Santoni 0b1af01822 Better exception logging and small pypo exception fix 2015-02-26 13:52:51 -05:00
drigato 38aa1d1cd9 Merge branch 'saas' into saas-store-file-size-and-hash-in-db 2015-02-24 16:44:17 -05:00
drigato d843de80cc Remove log statements 2015-02-24 16:22:20 -05:00
drigato 6113dff182 Debugging logs 2015-02-24 15:19:46 -05:00
drigato 86ba5c547e SAAS-596: Store file size and hash in database
Fixed exception handling in pypo
2015-02-24 12:32:46 -05:00
Albert Santoni b2a2153572 Merge branch '2.5.x' into saas 2015-02-24 12:04:11 -05:00
Albert Santoni 8a88b4b733 Reduce the pypo POLL_INTERVAL to lessen impact of RabbitMQ or web server outages 2015-02-24 12:03:35 -05:00
drigato be7a6854f0 SAAS-596: Store file size and hash in database
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
Daniel James 72f79d0f90 Debian/Ubuntu require a force-reload option for sysvinit scripts 2015-02-24 14:57:28 +00:00
Daniel James 4b850a5675 More permissions tweaks for Debian/Ubuntu compliance 2015-02-24 14:16:44 +00:00
Albert Santoni 1a8883b91d Merge branch '2.5.x-installer' of github.com:sourcefabric/Airtime into 2.5.x-installer 2015-02-23 12:50:43 -05:00
Daniel James 071715415b Fix permissions on files for Debian/Ubuntu compliance 2015-02-23 17:41:56 +00:00
Albert Santoni a2d8da617d Fixed everything about Airtime on Debian
* Added sysvinit scripts back in and cleaned them up
* service status now works correctly for all services
* Moved logging config files into install/ folders for the python_apps
* Fixed some small setup.py problems in the various python_apps
* Gave each python app a better bin/ script which doesn't fork, which lets
  service status work automagically.
2015-02-13 16:06:59 -05:00
Albert Santoni bbcd4fbe2e Tons of bugfixes for the installer on Debian
* Still need to get pypo working with sysvinit
* Still need to fix this logger.cfg silliness with pypo and
  media_monitor
2015-02-13 11:32:07 -05:00
Albert Santoni d46f4a52eb Installer tweaks and a pypo bugfix
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
drigato 93da48351c Deleted old, unused cloud_storage_downloader.py file from pypo 2015-01-29 14:29:59 -05:00
Duncan Sommerville b673017bfd Fix to setuptools deployment of pyponotify and liquidsoap 2015-01-28 15:09:13 -05:00
Duncan Sommerville bc604b992e CC-5986 - Fixed unit tests, removed unnecessary code from service execution files 2015-01-28 13:19:50 -05:00
Duncan Sommerville 875a9dfd8b CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime 2015-01-27 18:43:36 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville 4552089c19 Fixes to install & uninstall procedure 2015-01-15 17:33:47 -05:00
Duncan Sommerville 791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Duncan Sommerville 19a1817159 Fix a bad reversion in the airtime-playout binary 2015-01-15 10:12:52 -05:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
drigato d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville 674b8c69e4 Add very basic uninstall script, move install script to root directory 2015-01-12 16:13:39 -05:00
Duncan Sommerville 0fcac545e6 For now, just prompt users to start background services at the end of the install process 2015-01-12 10:53:31 -05:00
Duncan Sommerville bf1355a203 Yet another attempt to run upstart jobs as unprivileged user 2015-01-12 09:48:08 -05:00
Duncan Sommerville e568013db6 More work on running services as web user 2015-01-08 13:21:08 -05:00
Duncan Sommerville ab35827439 Different approach for running airtime services as unprivileged user 2015-01-08 12:56:09 -05:00
Duncan Sommerville a790527e67 More work on running upstart services as non-privileged user 2015-01-08 10:06:37 -05:00
Duncan Sommerville a9a59337b8 More work on running upstart services as non-privileged user 2015-01-07 16:31:30 -05:00
Duncan Sommerville e6d8a6f25e Move upstart .conf files to directory accessible by non-privileged users 2015-01-07 16:04:48 -05:00
Duncan Sommerville 0fef350e9d Fixed issue with liquidsoap service starting as daemon, fixed logging issue in pypocli 2015-01-07 14:25:24 -05:00
drigato 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
drigato 9d6cf8620f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-07 14:16:09 -05:00
drigato e5c806f658 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-01-07 14:13:36 -05:00
Duncan Sommerville 05c2ecdb89 Changed logger init to use paths relative to current file 2015-01-07 11:46:06 -05:00
Albert Santoni 3225fcc6bc Fix syntax errors in fdkaac.liq 2015-01-07 11:35:43 -05:00
Duncan Sommerville 5e8c4b112f More work on getting services working with new installer 2015-01-07 10:54:17 -05:00
Duncan Sommerville 8e6e72a501 More work on getting services working with new installer 2015-01-07 10:31:00 -05:00
Duncan Sommerville c66e6aa849 More work on getting services working with new installer 2015-01-07 10:01:32 -05:00
Albert Santoni fc912923ce Force the use of FDK-AAC and significantly boost AAC sound quality 2015-01-06 12:58:11 -05:00
Duncan Sommerville f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville bbc095f534 Added virtualenv back into install process 2015-01-05 15:38:01 -05:00
Duncan Sommerville 5f137d99a3 Added virtualenv back into install process 2015-01-05 14:42:53 -05:00
Duncan Sommerville fc68dfa256 Fixed service execution calls 2015-01-05 11:16:58 -05:00
Duncan Sommerville ee96380a41 Test to start upstart jobs as web user 2015-01-05 10:16:44 -05:00
Duncan Sommerville f35fb4968c Test to start upstart jobs as web user 2015-01-05 09:47:06 -05:00
Duncan Sommerville 344e1aa194 Test to start upstart jobs as web user 2015-01-05 09:30:08 -05:00
Duncan Sommerville 75c2a4a18b More work on media-monitor and pypo install process 2014-12-19 13:49:33 -05:00
Duncan Sommerville 6bc3a1cfba More work on switching pypo to use setuptools, added lxc-bootstrap script for ease of testing across distros 2014-12-19 09:47:54 -05:00
drigato 28a06136aa Better error logging when pypo downloads files 2014-12-17 18:30:06 -05:00
Duncan Sommerville 4749ef111c More work on switching pypo to use setuptools 2014-12-17 17:05:55 -05:00
Duncan Sommerville 29917ebf63 More work on switching pypo to use setuptools 2014-12-17 16:42:29 -05:00
Duncan Sommerville 97805ad271 Removed many unnecessary files and started changing pypo to use setuptools 2014-12-17 16:22:40 -05:00
Duncan Sommerville eefe8910cf More work on monitless installer 2014-12-16 21:27:37 -05:00
Duncan Sommerville 51a95fb989 More work on monitless installer 2014-12-16 20:12:20 -05:00
Duncan Sommerville 8a2c155289 More work on monitless installer 2014-12-16 19:42:07 -05:00
Duncan Sommerville ad4b61e89f More work on monitless installer 2014-12-16 19:05:17 -05:00
Duncan Sommerville 4043ebfd25 More work on monitless installer 2014-12-16 16:26:58 -05:00
Duncan Sommerville 8a353f970c More work on monitless installer 2014-12-16 15:45:35 -05:00
Duncan Sommerville 4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00
drigato aabe3799b1 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-15 12:49:41 -05:00
drigato 6de8bbe967 SAAS-514: PYPO -> Tracks may not become ready in time for playout 2014-12-15 12:27:51 -05:00
Albert Santoni d5fc90e9d3 Merge branch '2.5.x' into saas 2014-12-15 10:50:25 -05:00
Albert Santoni 8766519c71 Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
Albert Santoni 3b88b0ce22 Boost the Opus sound quality 2014-12-15 10:42:45 -05:00
drigato 7b80915c16 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-12-12 09:44:54 -05:00
drigato 29d3d877ab Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
	python_apps/airtime_analyzer/setup.py
2014-12-12 09:36:27 -05:00
Albert Santoni 3b1c776879 Removed all ReplayGain and Silan stuff from pypo, plus a bugfix
* Ripped out all the ReplayGain and Silan analysis from pypo, since
  it's now implemented in airtime_analyzer. This fixes a bunch of
  race conditions.
* Also renamed the replaygain field to replay_gain in airtime_analyzer
  to match Airtime.
2014-12-11 14:26:05 -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 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 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 c132cac43d Code cleanup 2014-11-12 14:42:34 -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 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