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

Ensure push targets aren't overwritten when starting multiple pushes at once

Browse source
This commit is contained in:
Thulinma 2024-07-22 10:40:25 +02:00
parent 9fd34c95fa
commit bad03412da
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/controller/controller_push.cpp
View file

@ -361,7 +361,8 @@ namespace Controller{
waitingPushes[streamname].erase(target); waitingPushes[streamname].erase(target);
if (!waitingPushes[streamname].size()){waitingPushes.erase(streamname);} if (!waitingPushes[streamname].size()){waitingPushes.erase(streamname);}
MEDIUM_MSG("Conditions of push `%s->%s` evaluate to true. Starting push...", stream.c_str(), target.c_str()); MEDIUM_MSG("Conditions of push `%s->%s` evaluate to true. Starting push...", stream.c_str(), target.c_str());
startPush(streamname, target); std::string tmpTarget = target;
startPush(streamname, tmpTarget);
curCount++; curCount++;
// If no end time is given but there is a start time, remove the push after starting it // If no end time is given but there is a start time, remove the push after starting it
if (startTime && !endTime){ if (startTime && !endTime){
@ -547,7 +548,8 @@ namespace Controller{
if (startTime && !endTime){ if (startTime && !endTime){
INFO_MSG("Immediately starting push %s->%s as the added push only has a defined start time" INFO_MSG("Immediately starting push %s->%s as the added push only has a defined start time"
, stream.c_str(), target.c_str()); , stream.c_str(), target.c_str());
startPush(stream, target); std::string tmpTarget = target;
startPush(stream, tmpTarget);
// Return push list // Return push list
response["push_auto_list"] = Controller::Storage["autopushes"]; response["push_auto_list"] = Controller::Storage["autopushes"];
return; return;
@ -563,7 +565,8 @@ namespace Controller{
for (std::set<std::string>::iterator jt = activeStreams.begin(); for (std::set<std::string>::iterator jt = activeStreams.begin();
jt != activeStreams.end(); ++jt){ jt != activeStreams.end(); ++jt){
std::string streamname = *jt; std::string streamname = *jt;
startPush(streamname, target); std::string tmpTarget = target;
startPush(streamname, tmpTarget);
} }
} }
// Return push list // Return push list