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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
#	src/output/output_http_internal.h
#	src/output/output_https.cpp
This commit is contained in:
Thulinma 2020-03-06 15:20:38 +01:00
commit 29bc96d8d7
5 changed files with 108 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/output/output_http.cpp
View file

@ -309,6 +309,14 @@ namespace Mist {
if ((*it)["type"].asStringRef() == "uint" || (*it)["type"].asStringRef() == "int" || (*it)["type"].asStringRef() == "debug"){
p[it.key()] = JSON::Value(p[it.key()].asInt()).asString();
}
if ((*it)["type"].asStringRef() == "inputlist" && p[it.key()].isArray()){
jsonForEach(p[it.key()], iVal){
(*iVal) = iVal->asString();
argarr[argnum++] = (char*)((*it)["option"].c_str());
argarr[argnum++] = (char*)((*iVal).c_str());
}
continue;
}
}
if (p[it.key()].asStringRef().size() > 0){
argarr[argnum++] = (char*)((*it)["option"].c_str());
@ -342,7 +350,8 @@ namespace Mist {
p["nostreamtext"] = getenv("MIST_HTTP_nostreamtext");
}
if (getenv("MIST_HTTP_pubaddr")){
p["pubaddr"] = getenv("MIST_HTTP_pubaddr");
std::string pubAddrs = getenv("MIST_HTTP_pubaddr");
p["pubaddr"] = JSON::fromString(pubAddrs);
}
}else{
//find connector in config