cbb8ac7dc6
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-18 17:45:00 -05:00
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
2cfe08b33a
Updated FTP upload hook script with new vhost.map file location
2014-11-18 14:58:27 -05:00
32bdbe1ad6
Improved some comments
2014-11-14 11:12:10 -05:00
71f2cc11d2
Fix for incorrect watchdog disabling
2014-11-12 17:04:21 -05:00
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
8eaeaf71f9
airtime_analyzer status_reporter shutdown fix
2014-11-12 17:01:59 -05:00
aff6104839
Disable airtime_analyzer watchdog
2014-11-12 16:12:33 -05:00
24cae3b3d6
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 18:41:26 -05:00
b324031ee6
Disable those new requirements because pip requires gcc to install them
2014-11-11 18:41:09 -05:00
024923ba6a
Disable SSL verification for SaaS as a temporary workaround
2014-11-11 12:18:20 -05:00
5f27e3099a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 11:19:31 -05:00
63b357f0ee
Updated requirements for airtime_analyzer to make python-requests
...
support SNI properly
2014-11-11 11:18:55 -05:00
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
ef9ab1acf0
Merge branch '2.5.x' into saas
2014-10-30 17:42:55 -04:00
8f5af6556d
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
2014-10-30 17:41:00 -04:00
363d022b0c
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-22 11:39:52 -04:00
53dc92b204
StatusReporter exception handler to prevent thread from dying under any circumstances
2014-10-22 11:39:22 -04:00
54523e264c
Fix rare exception during shutdown in airtime_analyzer
2014-10-22 11:38:22 -04:00
c4af1b6b19
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 19:24:03 -04:00
82f251f061
Fix invalid python in StatusReporter
2014-10-21 19:23:48 -04:00
a1ef9d60c0
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 15:36:51 -04:00
28be5c6bd3
CC-5929: Certain long filenames can result in the extension getting cut off
2014-10-21 15:34:10 -04:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
081ca0a6a4
Reworked upstart config for airtime_analyzer
2014-10-10 11:28:44 -04:00
4e545dfe9f
Commented out monit config lines to fix install error
2014-09-16 18:20:11 -04:00
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
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
ead4a3c565
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:48:31 -04:00
e5881f2530
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:29:52 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
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
bbade8401c
FTP upload hook bugfix for files with commas in their names (CURL
...
restriction)
2014-07-10 16:43:13 -04:00
08f4610aec
Fix CURL error handling in FTP upload hook
2014-07-10 12:12:16 -04:00
fc2f68cb51
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-07 15:54:02 -04:00
e84f765696
Better FileMover permissions unit test (passes as root)
2014-07-07 15:53:25 -04:00
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
a7a7df4236
CC-5668: Weekly recordings get overwritten
2014-06-09 15:04:35 -04:00
1468ff0f7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 13:47:07 -04:00
5e7fdb9606
Don't retry Analyzer HTTP requests if the web app is broken
2014-06-04 13:46:25 -04:00
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
a969f8fc44
CC-5856: Analyzer metadata exception
...
* Fixed parsing of metadata when there's empty lists returned (mutagen's
API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
0beaf5dcaf
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 11:42:26 -04:00
4548123ad9
CC-5861: Long file paths will cause analyzer error
...
* Fixed it
2014-06-03 11:41:45 -04:00
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
1373d4984f
CC-5862: Invalid UTF-8 chars cause DB error
...
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -04:00
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
d21cb596cd
CC-5860: Analyzer HTTP requests can hang indefinitely
...
* Log a backtrace when sent the USR2 signal (kill -SIGUSR2 <pid>)
* Rigged up up something to strace and restart when we see a request hanging
2014-05-26 18:59:28 -04:00
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
Albert Santoni
drigato
Duncan Sommerville
Robert Elder