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
Albert Santoni
363d022b0c
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-22 11:39:52 -04:00
Albert Santoni
53dc92b204
StatusReporter exception handler to prevent thread from dying under any circumstances
2014-10-22 11:39:22 -04:00
Albert Santoni
54523e264c
Fix rare exception during shutdown in airtime_analyzer
2014-10-22 11:38:22 -04:00
Albert Santoni
c4af1b6b19
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 19:24:03 -04:00
Albert Santoni
82f251f061
Fix invalid python in StatusReporter
2014-10-21 19:23:48 -04:00
Albert Santoni
a1ef9d60c0
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 15:36:51 -04:00
Albert Santoni
28be5c6bd3
CC-5929: Certain long filenames can result in the extension getting cut off
2014-10-21 15:34:10 -04:00
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
Albert Santoni
081ca0a6a4
Reworked upstart config for airtime_analyzer
2014-10-10 11:28:44 -04:00
Duncan Sommerville
4e545dfe9f
Commented out monit config lines to fix install error
2014-09-16 18:20:11 -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
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
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
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
Albert Santoni
bbade8401c
FTP upload hook bugfix for files with commas in their names (CURL
...
restriction)
2014-07-10 16:43:13 -04:00
Albert Santoni
08f4610aec
Fix CURL error handling in FTP upload hook
2014-07-10 12:12:16 -04:00
Albert Santoni
fc2f68cb51
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-07 15:54:02 -04:00
Albert Santoni
e84f765696
Better FileMover permissions unit test (passes as root)
2014-07-07 15:53:25 -04:00
Albert Santoni
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
Albert Santoni
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
Albert Santoni
a7a7df4236
CC-5668: Weekly recordings get overwritten
2014-06-09 15:04:35 -04:00
Albert Santoni
1468ff0f7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 13:47:07 -04:00
Albert Santoni
5e7fdb9606
Don't retry Analyzer HTTP requests if the web app is broken
2014-06-04 13:46:25 -04:00
Albert Santoni
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
Albert Santoni
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
Albert Santoni
0beaf5dcaf
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 11:42:26 -04:00
Albert Santoni
4548123ad9
CC-5861: Long file paths will cause analyzer error
...
* Fixed it
2014-06-03 11:41:45 -04:00
Albert Santoni
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
Albert Santoni
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
Albert Santoni
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
Albert Santoni
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
drigato
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
drigato
0040965222
CC-5840: Add Media -> Endless retries if there is a validation error
...
Fixed by not adding message to retry queue if request returns a
validation specific error code (422)
2014-05-08 13:01:49 -04:00
drigato
c291439483
Adding back analyzer deadlock workaround.
...
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
drigato
cf0aa3556f
Adding back airtime analyzer deadlock workaround
2014-05-07 14:07:49 -04:00
drigato
8a342f7ef5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-07 13:12:40 -04:00
drigato
81dd1deba3
Removing something for testing
2014-05-07 13:12:18 -04:00
Albert Santoni
e4e97e9c32
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-06 15:03:14 -04:00
Albert Santoni
56c3d8070b
Alternate bugfix for logging deadlock in airtime_analyzer
2014-05-06 15:01:25 -04:00
Albert Santoni
bc5c5a3fb5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 18:27:14 -04:00
Albert Santoni
ed494ac587
Some defensive code against multiprocess related deadlocks
...
* Reinitialize logging in child processes so we don't inherit locks.
Might be causing a deadlock we're seeing on Pro right now.
2014-05-05 18:25:47 -04:00
Albert Santoni
7073c31531
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:56:59 -04:00
Albert Santoni
d063700254
CC-5834: Airtime Analyzer: Bitrate is missing
...
* Fixed
2014-05-05 14:56:32 -04:00
Albert Santoni
13b6591dc1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:39:55 -04:00
Albert Santoni
22343ed99c
Fixed bitrate import in airtime_analyzer
2014-05-05 14:39:36 -04:00
Albert Santoni
5160063f70
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-30 18:46:50 -04:00