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

Incoming pushes now wait for buffer shutdowns and restart it, if needed (no more failing quick successive pushes!), simplified output logic with keepGoing() function, added missing termination checks in some wait loops

Browse source 
# Conflicts:
#	src/output/output.h
This commit is contained in:
Thulinma 2017-07-04 13:23:22 +02:00
parent c2520f9c81
commit 194a717ad6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/output/output.cpp
View file

@ -168,6 +168,7 @@ namespace Mist{
if(Triggers::shouldTrigger("CONN_PLAY", streamName)){
std::string payload = streamName+"\n" + getConnectedHost() +"\n"+capa["name"].asStringRef()+"\n"+reqUrl;
if (!Triggers::doTrigger("CONN_PLAY", payload, streamName)){
INFO_MSG("Shutting down due to CONN_PLAY trigger rejection");
onFinish();
myConn.close();
}
@ -237,7 +238,7 @@ namespace Mist{
unsigned int i = 0;
tmpEx.setSync(initialSync);
//wait max 10 seconds for sync
while ((!tmpEx.getSync() || tmpEx.getSync() == 2) && i++ < 100){
while ((!tmpEx.getSync() || tmpEx.getSync() == 2) && i++ < 100 && keepGoing()){
Util::wait(100);
stats(true);
tmpEx = IPC::statExchange(statsPage.getData());
@ -1216,6 +1217,7 @@ namespace Mist{
if (statsPage.getData()){
/*LTS-START*/
if (!statsPage.isAlive()){
INFO_MSG("Shutting down on controller request");
onFinish();
myConn.close();
return;