seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* fix a bug in broadcasting and also fix bad log refernce

This commit is contained in:
Seth Call 2015-01-01 14:22:42 -06:00
parent 8a84ff5609
commit 9b1525715e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/lib/jam_ruby/resque/scheduled/icecast_source_check.rb
View File

@ -49,13 +49,13 @@ module JamRuby
def handle_notifications(mount)
if mount.listeners == 0 && mount.sourced
# if no listeners, but we are sourced, then ask it to stop sourcing
@@log.debug("SOURCE_DOWN_REQUEST called on mount #{mount.name}")
log.debug("SOURCE_DOWN_REQUEST called on mount #{mount.name}")
mount.notify_source_down_requested
elsif mount.listeners > 0 && !mount.sourced
# if we have some listeners, and still are not sourced, then ask to start sourcing again
@@log.debug("SOURCE_UP_REQUEST called on mount #{mount.name}")
log.debug("SOURCE_UP_REQUEST called on mount #{mount.name}")
mount.notify_source_up_requested
end

9
web/app/assets/javascripts/sessionList.js
View File

@ -23,10 +23,11 @@
// related to listen
function stateChange(e, data) {
var $listenLink = e.element; // TODO: this is empty
console.log(e,$(this))
var $listenText = $('.listen-link-text', $listenLink);
var $listenDetails = $('.listen-link-details', $listenLink);
var $listenLink = data.element;
var $parent = $listenLink.closest('.action-links')
//console.log(e,$(this))
var $listenText = $('.listen-link-text', $parent);
var $listenDetails = $('.listen-link-details', $parent);
if(data.displayText)
{