3247c7288d
use proper parameters for earlier versions of 'timeout' command
...
-small typo
2013-05-28 16:21:45 -04:00
a4ca2deb0f
use proper parameters for earlier versions of 'timeout' command
...
-lucid has timeout with incompatible parameters compared to newer
versions of ubuntu.
2013-05-28 16:18:29 -04:00
4c3d2b20db
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-if does not exist does not work on pre 5.2 monit version
2013-05-28 15:54:31 -04:00
66bb1f6d93
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:48:15 -04:00
82c0fe1088
CC-5123
...
Pypo: Redundant Pypopush happens after restart pypo service
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:24:26 -04:00
1130cf961c
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
-fixed
2013-05-27 13:41:36 -04:00
ca37ec3aff
CC-5049:
...
Error messages on Liquidsoap start up/shut down after Airtime install
Suppress global warning messages. Clients should decide whether to print
or not.
2013-05-23 17:17:00 -04:00
2a897414a4
make operators more local to each queue source
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:02:50 -04:00
5c11f5fc72
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
4e1dc6a86e
make operators more local to each queue source
2013-05-22 18:07:12 -04:00
45e5d339a1
make more operators local to each source
2013-05-22 18:03:56 -04:00
dc19d3f0b0
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 17:39:33 -04:00
36567c85cd
create on_metadata callback for each source instead of once on unified source
2013-05-22 17:39:18 -04:00
ab89b80b85
remove unnecessary install code for saas
2013-05-21 17:36:57 -04:00
ab5639ef79
remove unnecessary install code for saas
2013-05-21 17:27:34 -04:00
3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
8e617b33de
add ability to use id's with mksafe operator
2013-05-21 16:31:32 -04:00
76a02796b7
implement method stub
2013-05-17 12:16:04 -04:00
d205b0dbd3
remove string literal
2013-05-17 12:14:33 -04:00
59785a952f
make up for lack of 'total_seconds()' lib function for pre 2.7 version of python
2013-05-16 12:25:21 -04:00
d2f29b1f88
more informative message to user about new init.d script behaviour
2013-05-16 12:08:32 -04:00
1ab27e3cf8
be more idiomatic
2013-05-15 17:18:42 -04:00
95bb5b2f36
CC-5153:
...
Cancel show won't cut off current song after airtime-playout is restarted
-fixed
2013-05-15 17:18:15 -04:00
80686b7063
add parameter parsing to airtime-liquidsoap script.
...
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
c693c4b015
remoe id's for mksafe (they aren't supported params)
2013-05-14 15:14:57 -04:00
a59fc69d17
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 15:10:13 -04:00
b3f0a2fcdd
CC-5144:
...
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
298e5a9b77
better idenfication of which mksafe is being applied
2013-05-13 17:52:43 -04:00
f5a0d0a9a4
CC-5123:
...
Pypo: Redundant Pypopush happens after restart pypo service
-was clearing the queue after fetching the schedule :S
2013-05-13 17:52:22 -04:00
be465be9b2
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
add missing file
2013-05-13 16:10:21 -04:00
85afe53c89
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
fixed
2013-05-13 15:45:56 -04:00
28576adf42
disable liquidsoap's add operator normalizing audio
2013-05-10 23:19:54 -04:00
56b9d0580f
CC-5071:
...
Better RabbitMQ passwords
-fixed
2013-05-08 15:25:30 -04:00
f0e846db75
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
fixed
2013-05-08 13:47:24 -04:00
3ae3c7e802
sanity check to warn if cue_out - cue_in != end - start
2013-05-07 15:05:14 -04:00
1895686c85
CC-5098: Liquidsoap: Restart liquidsoap will make the output stream silence until next song starts
...
-fixed
2013-05-06 16:39:17 -04:00
2fc4afef68
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:11:19 -04:00
2eaf81d366
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:08:57 -04:00
3a1048bdec
ensure pypo registers with server before doing Liquidsoap check
2013-05-06 11:42:39 -04:00
ec7eb5f264
CC-5094 Liquidsoap crash if unsupported encoder in the liq script
...
-keep up with liquidsoap changes
2013-05-04 14:11:21 -04:00
fdcfc4d06c
CC-5094
...
Liquidsoap crash if unsupported encoder in the liq script
2013-05-04 10:57:22 -04:00
6c42064c14
refactor methods into appropriate locations
2013-05-02 18:46:16 -04:00
84efb4a9b7
work around to work with annoying static methods - should remove these later..
2013-05-02 17:59:03 -04:00
1e25d786ee
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-02 17:31:42 -04:00
f2564cf732
temporarily disable opus + aac until liquidsoap binaries are ready
2013-05-02 16:09:04 -04:00
88ba36601f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-01 00:37:26 -04:00
21bed91678
add brackets to force operator precedence
2013-04-26 15:56:48 -04:00
49d1755b52
fix incorrect merge
2013-04-26 13:58:44 -04:00
705329ee5d
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-26 13:48:15 -04:00
628e075828
pypo syntax error
2013-04-26 11:35:52 -04:00
1158fc2c9e
more legible comment
2013-04-25 22:38:06 -04:00
ca86d6b68b
fix potential out-of-bounds string index error
2013-04-25 22:36:21 -04:00
7bf6f3669b
more stringent verification of equivalence between tracks
2013-04-25 22:33:03 -04:00
039d8a7c0f
fix worst offenders of > 80 character row length
2013-04-25 22:32:27 -04:00
1a765e6cb9
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2013-04-25 22:20:03 -04:00
fb4a02faec
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-25 22:11:26 -04:00
5b2e8e221f
Merge branch 'CC-4417-opus-support'
...
Conflicts:
python_apps/pypo/airtime-liquidsoap
2013-04-25 18:23:37 -04:00
ccd3293f3d
CC-4417: Opus codec support
2013-04-25 18:23:02 -04:00
45ac5282b8
clean unused import
2013-04-24 15:16:50 -04:00
07f0ae6c28
CC-1469: Crossfading support (non-equal power)
...
-fix restarting airtime playout not resyncing to schedule correctly
2013-04-22 17:33:56 -04:00
96579b7ef4
CC-5057: Pypopush error: no attribute 'push_item'
...
-fixed
2013-04-22 16:48:52 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
10fb9c9165
Merge branch '2.3.x' into 2.3.x-saas
2013-04-08 18:56:12 -04:00
5cb950e43f
Merge branch '2.3.x'
2013-04-08 18:55:54 -04:00
5b4bc038b0
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-04-08 18:53:49 -04:00
aca651a1b4
better logging
2013-04-08 18:53:35 -04:00
f13f6c6a70
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-07 20:20:57 -04:00
0d45d7b8cd
CC-5042:
...
Do process matching by process name instead of PID file
-fixed
2013-04-07 20:19:51 -04:00
67e3803189
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 17:33:19 -04:00
db5d2283f4
Merge branch '2.3.x'
...
Conflicts:
python_apps/pypo/pypofetch.py
2013-04-05 17:33:02 -04:00
3d135a9f4a
improved logging on why files sometimes aren't removed
2013-04-05 17:31:55 -04:00
18574fd10f
Merge branch '2.3.x'
2013-04-05 15:57:54 -04:00
5b1383d48d
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:57:41 -04:00
5ff7ce857f
use sigkill immediately for unresponsive telnet
...
-fix order of arguments
2013-04-05 15:57:16 -04:00
92d0a6178e
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:34:04 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
afb55c7b51
CC-5038:
...
Silan error: list index out of range
cosmetic bug fix to prevent so much logging
2013-04-05 14:20:34 -04:00
1a389a3765
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 13:57:46 -04:00
08c93e10fd
Merge branch '2.3.x'
2013-04-05 13:57:32 -04:00
cdb53048c7
ensure that an empty listener stats dict is not sent to the server
2013-04-05 13:56:41 -04:00
1a8ab6cd89
Merge branch '2.3.x'
2013-04-05 12:43:01 -04:00
7727b72e68
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 12:42:34 -04:00
266823b1d9
use sigkill immediately for unresponsive telnet
2013-04-05 12:42:05 -04:00
2b019c4615
Merge branch '2.3.x'
2013-04-05 11:28:47 -04:00
a0bfbce61b
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 11:28:07 -04:00
f8dbbe71ab
increase monit timeout after liquidsoap starts to 30 seconds.
2013-04-05 11:27:45 -04:00
5dd54783c0
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 16:48:37 -04:00
e2e6a4263c
Merge branch '2.3.x' into devel
2013-04-03 16:48:19 -04:00
ec7c898f5a
fix some problems with invalid Liquidsoap PID file
2013-04-03 16:47:46 -04:00
bfb252edf5
CC-4417: Opus codec support
2013-04-03 11:40:57 -04:00
2d2aa8eb46
Merge branch '2.3.x' into 2.3.x-saas
2013-04-02 12:31:03 -04:00
0bb7fa4975
don't change monit monitor state on service start/stop
2013-04-02 12:30:15 -04:00
811abc4baf
don't change monit monitor state on service start/stop
2013-04-01 19:31:13 -04:00
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
caa2413fd8
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-26 15:02:08 -04:00
d79bfaaef9
-fix infinite loop on invalid files
2013-03-26 15:01:44 -04:00
5ab52b12c7
CC-4417:
...
Opus codec support
2013-03-26 15:00:41 -04:00
38f8a0d231
more robust handling if system permissions go wrong
2013-03-24 22:58:13 -04:00
89983bd4f8
remove unnecessary file delete
2013-03-24 22:25:38 -04:00
a5c8b7624e
CC-1469: Crossfading support (non-equal power)
...
-handle file attributes changing (end time, replaygain etc.)
2013-03-22 15:56:05 -04:00
7a6940c96c
Merge branch 'cc-1469-crossfade' into devel
...
Conflicts:
python_apps/pypo/pypopush.py
2013-03-22 15:24:14 -04:00
8a5c82d71a
CC-1469: Crossfading support (non-equal power)
...
-fix few bugs
2013-03-22 15:21:28 -04:00
00475275e5
Merge branch '2.3.x' into 2.3.x-saas
2013-03-22 14:24:12 -04:00
fc6742869f
better frozen liquidsoap handling
2013-03-22 14:23:42 -04:00
19753429dc
add wait timer before liquidsoap is shutdown
2013-03-22 14:04:50 -04:00
33ca2e7c9c
CC-1469: Crossfading support (non-equal power)
...
-refactor
2013-03-22 12:16:17 -04:00
708d36ba9c
syntax error
2013-03-19 15:22:27 -04:00
6dae7d3973
CC-1469: Crossfading support (non-equal power)
...
-cleanup
2013-03-15 17:00:36 -04:00
445573dcdb
CC-1469: Crossfading support (non-equal power)
...
-webstreams scheduled in the future are now working...
2013-03-15 15:07:55 -04:00
dd7fc61e23
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-15 12:50:23 -04:00
2b7ebafa94
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-14 18:29:52 -04:00
91d1243554
CC-1469:
...
Crossfading support (non-equal power)
-initial commit
2013-03-14 16:50:55 -04:00
13b3eec0ad
Merge branch '2.3.x' into 2.3.x-saas
2013-03-12 16:38:16 -04:00
661a407f72
CC-5016: Allow user control for webstream metadata format
...
-fixed
2013-03-08 16:45:19 -05:00
fe96b66fd7
CC-5016:
...
Allow user control for webstream metadata format
-fixed
2013-03-08 16:00:16 -05:00
0075b27947
CC-5015: Allow for cue_out points to be Null in DB
...
-prep for 2.4
2013-03-08 14:57:20 -05:00
30970598fe
minor fixes
...
-don't show print subprocess commands to py-interpreter.log
2013-03-08 12:39:29 -05:00
3969e38d51
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-07 18:34:10 -05:00
c2fb811100
CC-5012:
...
remove all shell=True commands for subprocess calls
-fixed
2013-03-07 18:33:55 -05:00
fc261035a8
CC-4999: Do silan analysis quietly in the background
...
-set silan nice level to 19
2013-03-06 19:48:35 -05:00
0321464ab8
CC-4999:
...
Do silan analysis quietly in the background
-fixed
2013-03-06 18:24:19 -05:00
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
8e314477c7
CC-5005: airtime-purge doesn't remove all files
...
-cleanup
2013-03-06 12:26:07 -05:00
e669b7a91a
refactor some liquidsoap code + remove unused --data argument
2013-03-05 17:31:09 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
215e5ccb4c
CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade
...
-don't even install rabbitmq monit file
2013-03-05 16:21:05 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
05b988fc6a
CC-4758: File removed before Liquidsoap finishes reading it?
...
-fixed
2013-03-01 16:15:28 -05:00
259f70bc21
CC-4915: Media-Monitor cannot handle rabbitmq restart event
...
-fixed
2013-03-01 16:05:55 -05:00
764ee0389f
CC-4916: Pypo cannot handle Schedule updates after rabbitmq restart happens
...
-fixed
2013-03-01 15:52:41 -05:00
0f7063e8a6
another refactor of the switches in LS
2013-03-01 12:48:32 -05:00
7e19eba7e1
another refactor of LS source
2013-03-01 11:44:11 -05:00
6624911d2c
minor refactor of LS code
2013-02-28 18:54:23 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
5ae4ed67a5
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:33:59 -05:00
66fbfa1554
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:27:52 -05:00
b3ecb477be
minor refactor of LS code
2013-02-27 17:48:10 -05:00
fbaba59dca
CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory
...
-changed to 600MB for now. May lower even more later
2013-02-26 14:47:48 -05:00
15f2533225
less verbose logging
2013-02-26 13:34:05 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
331386f74f
CC-4910: Need to properly handle non-200 http status codes in api client
...
-fixed
2013-02-04 16:05:58 -05:00
34eee60bee
CC-4910: Need to properly handle non-200 http status codes in api client
...
-wrap all service calls in exception
2013-02-03 00:40:41 -05:00
04a956217f
Merge branch '2.3.x' into 2.3.x-saas
2013-02-02 08:51:06 -05:00
1f4cfa8f65
fix pypo not auto restarting
2013-02-02 08:50:44 -05:00
Martin Konecny
Naomi