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

Fixed stats timing out while waiting for data, improved debug message verbosity some more.

Browse source
This commit is contained in:
Thulinma 2016-05-19 10:31:32 +02:00
parent 601a10a275
commit 94020051c4
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/output/output.cpp
View file

@ -203,7 +203,7 @@ namespace Mist {
/// Finally, calls updateMeta() /// Finally, calls updateMeta()
void Output::reconnect(){ void Output::reconnect(){
if (!Util::startInput(streamName)){ if (!Util::startInput(streamName)){
DEBUG_MSG(DLVL_FAIL, "Opening stream failed - aborting initalization"); FAIL_MSG("Opening stream %s failed - aborting initalization", streamName.c_str());
onFail(); onFail();
return; return;
} }
@ -233,9 +233,10 @@ namespace Mist {
while (!isReadyForPlay()){ while (!isReadyForPlay()){
Util::sleep(1000); Util::sleep(1000);
if (Util::epoch() > waitUntil){ if (Util::epoch() > waitUntil){
FAIL_MSG("Giving up waiting for playable tracks"); FAIL_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
break; break;
} }
stats();
updateMeta(); updateMeta();
} }
} }
@ -295,16 +296,16 @@ namespace Mist {
if (selCounter + genCounter > bestSoFarCount){ if (selCounter + genCounter > bestSoFarCount){
bestSoFarCount = selCounter + genCounter; bestSoFarCount = selCounter + genCounter;
bestSoFar = index; bestSoFar = index;
DEBUG_MSG(DLVL_HIGH, "Match (%u/%u): %s", selCounter, selCounter+genCounter, (*it).toString().c_str()); HIGH_MSG("Match (%u/%u): %s", selCounter, selCounter+genCounter, (*it).toString().c_str());
} }
}else{ }else{
DEBUG_MSG(DLVL_VERYHIGH, "Not a match for currently selected tracks: %s", (*it).toString().c_str()); VERYHIGH_MSG("Not a match for currently selected tracks: %s", (*it).toString().c_str());
} }
} }
index++; index++;
} }
DEBUG_MSG(DLVL_MEDIUM, "Trying to fill: %s", capa["codecs"][bestSoFar].toString().c_str()); MEDIUM_MSG("Trying to fill: %s", capa["codecs"][bestSoFar].toString().c_str());
//try to fill as many codecs simultaneously as possible //try to fill as many codecs simultaneously as possible
if (capa["codecs"][bestSoFar].size() > 0){ if (capa["codecs"][bestSoFar].size() > 0){
jsonForEach(capa["codecs"][bestSoFar], itb) { jsonForEach(capa["codecs"][bestSoFar], itb) {