hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LSP bugfixes - mostly about status displays for protocols and streams

Browse source
This commit is contained in:
cat 2013-01-16 12:17:04 +01:00 • committed by Thulinma
parent b5bb288ac0
commit eb57d6f4a4
4 changed files with 198 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lsp/functions.js
View file

@ -187,7 +187,7 @@
for(var stream in data.streams) for(var stream in data.streams)
{ {
streams[stream] = [data.streams[stream].online, 0]; streams[stream] = [data.streams[stream].online, 0, data.streams[stream].error];
cnt++; cnt++;
} }
@ -339,7 +339,7 @@
delete data.statistics; // same goes for the stats delete data.statistics; // same goes for the stats
//IE breaks if the console isn't opened, so keep commented when committing //IE breaks if the console isn't opened, so keep commented when committing
console.log('[763] SEND', data); //console.log('[763] SEND', data);
$.ajax( $.ajax(
{ {
@ -363,7 +363,7 @@
$('#shield').remove(); // remove loading display $('#shield').remove(); // remove loading display
//IE breaks if the console isn't opened, so keep commented when committing //IE breaks if the console isn't opened, so keep commented when committing
console.log('[785] RECV', d); //console.log('[785] RECV', d);
if(d && d['authorize'] && d['authorize']['challenge']) if(d && d['authorize'] && d['authorize']['challenge'])
{ {
@ -435,12 +435,12 @@
{ {
return "<span>Unknown, checking...</span>"; return "<span>Unknown, checking...</span>";
} }
switch(status) switch(status)
{ {
case 1: return "<span class='green'>Running</span>"; break; case 1: return "<span class='green'>Running</span>"; break;
case 0: return "<span class='red'>Offline</span>"; break; case 0: return "<span class='red'>Offline</span>"; break;
default: return "<span class='red'>" + status + "</span>"; break; case -1: return "<span>Unknown, checking...</span>"; break;
default: return "<span class='green'>" + status + "</span>"; break;
} }
} }

17
lsp/main.js
View file

@ -580,6 +580,7 @@
$('input').each(function(){ $('input').each(function(){
newprotocol[$(this).attr('id').split('-')[2]] = $(this).val();; newprotocol[$(this).attr('id').split('-')[2]] = $(this).val();;
}); });
newprotocol.online = -1;
if (streamname == 'new') { if (streamname == 'new') {
settings.settings.config.protocols.push(newprotocol); settings.settings.config.protocols.push(newprotocol);
}else{ }else{
@ -678,9 +679,16 @@
showTab('streams'); showTab('streams');
} }
else else
{
if (streams[stream][2])
{
streamstatus = streams[stream][2];
}
else
{ {
streamstatus = streams[stream][0]; streamstatus = streams[stream][0];
} }
}
$(this).children(':nth-child(5)').html(formatStatus(streamstatus)); $(this).children(':nth-child(5)').html(formatStatus(streamstatus));
$(this).children(':nth-child(6)').html(streams[stream][1]); $(this).children(':nth-child(6)').html(streams[stream][1]);
}); });
@ -738,6 +746,11 @@
$tr.append( $('<td>').text( cstr.name ) ); $tr.append( $('<td>').text( cstr.name ) );
if (cstr.error)
{
cstr.online = cstr.error;
}
$tr.append( $('<td>').html( formatStatus( cstr.online ) ) ); $tr.append( $('<td>').html( formatStatus( cstr.online ) ) );
var cviewers = 0; var cviewers = 0;
@ -894,6 +907,8 @@
sdata.name = newname; sdata.name = newname;
sdata.channel.URL = s.val(); sdata.channel.URL = s.val();
sdata.preset.cmd = p.val(); sdata.preset.cmd = p.val();
sdata.online = -1;
sdata.error = null;
if(streamname == 'new') if(streamname == 'new')
{ {
@ -1148,8 +1163,6 @@
loadSettings(function(){ loadSettings(function(){
serverstats = settings.settings.capabilities; serverstats = settings.settings.capabilities;
console.log(serverstats); //weghalen
if (serverstats.cpu !== undefined) if (serverstats.cpu !== undefined)
{ {
$('#page').append( $('#page').append(