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