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

Made Util::streamName and exitReason thread-local

Browse source
This commit is contained in:
Thulinma 2020-08-28 19:23:48 +02:00
parent 7c6da9d455
commit 7423868de4
11 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/output/output.cpp
View file

@ -87,7 +87,7 @@ namespace Mist{
// If we have a streamname option, set internal streamname to that option
if (!streamName.size() && config->hasOption("streamname")){
streamName = config->getString("streamname");
Util::streamName = streamName;
Util::setStreamName(streamName);
}
/*LTS-START*/
@ -327,7 +327,7 @@ namespace Mist{
JSON::Value strCnf = Util::getStreamConfig(streamName);
if (strCnf && strCnf["fallback_stream"].asStringRef().size()){
streamName = strCnf["fallback_stream"].asStringRef();
Util::streamName = streamName;
Util::setStreamName(streamName);
INFO_MSG("Switching to configured fallback stream '%s'", streamName.c_str());
reconnect();
return;
@ -358,7 +358,7 @@ namespace Mist{
newStrm.c_str());
std::string origStream = streamName;
streamName = newStrm;
Util::streamName = streamName;
Util::setStreamName(streamName);
if (!Util::startInput(streamName, "", true, isPushing())){
onFail("Stream open failed (fallback stream for '" + origStream + "')", true);
return;