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

Load balancer can now redirect, if given a protocol name.

Browse source
This commit is contained in:
Thulinma 2017-10-22 22:41:57 +02:00
parent 52816a8daa
commit 3e4dca8f84
1 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/utils/util_load.cpp
View file

@ -43,11 +43,29 @@ struct streamDetails{
uint32_t prevTotal; uint32_t prevTotal;
}; };
class outUrl{
public:
std::string pre, post;
outUrl(){};
outUrl(const std::string &u, const std::string &host){
std::string tmp = u;
if (u.find("HOST") != std::string::npos){
tmp = u.substr(0, u.find("HOST")) + host + u.substr(u.find("HOST")+4);
}
size_t dolsign = tmp.find('$');
pre = tmp.substr(0, dolsign);
if (dolsign != std::string::npos){
post = tmp.substr(dolsign+1);
}
}
};
class hostDetails{ class hostDetails{
private: private:
tthread::mutex *hostMutex; tthread::mutex *hostMutex;
std::map<std::string, struct streamDetails> streams; std::map<std::string, struct streamDetails> streams;
std::set<std::string> conf_streams; std::set<std::string> conf_streams;
std::map<std::string, outUrl> outputs;
unsigned int cpu; unsigned int cpu;
unsigned long long ramMax; unsigned long long ramMax;
unsigned long long ramCurr; unsigned long long ramCurr;
@ -181,6 +199,13 @@ public:
availBandwidth / 1024 / 1024, score); availBandwidth / 1024 / 1024, score);
return score; return score;
} }
std::string getUrl(std::string &s, std::string &proto){
if (!hostMutex){hostMutex = new tthread::mutex();}
tthread::lock_guard<tthread::mutex> guard(*hostMutex);
if (!outputs.count(proto)){return "";}
const outUrl& o = outputs[proto];
return o.pre + s + o.post;
}
void addViewer(std::string &s){ void addViewer(std::string &s){
if (!hostMutex){hostMutex = new tthread::mutex();} if (!hostMutex){hostMutex = new tthread::mutex();}
tthread::lock_guard<tthread::mutex> guard(*hostMutex); tthread::lock_guard<tthread::mutex> guard(*hostMutex);
@ -275,6 +300,12 @@ public:
conf_streams.insert(it->asStringRef()); conf_streams.insert(it->asStringRef());
} }
} }
outputs.clear();
if (d.isMember("outputs") && d["outputs"].size()){
jsonForEach(d["outputs"], op){
outputs[op.key()] = outUrl(op->asStringRef(), host);
}
}
addBandwidth *= 0.75; addBandwidth *= 0.75;
} }
}; };
@ -457,6 +488,9 @@ int handleRequest(Socket::Connection &conn){
} }
// Balance given stream // Balance given stream
std::string stream = H.url.substr(1); std::string stream = H.url.substr(1);
std::string proto = H.GetVar("proto");
H.SetVar("proto", "");
std::string vars = H.allVars();
if (stream == "favicon.ico"){ if (stream == "favicon.ico"){
H.Clean(); H.Clean();
H.SendResponse("404", "No favicon", conn); H.SendResponse("404", "No favicon", conn);
@ -484,8 +518,16 @@ int handleRequest(Socket::Connection &conn){
bestHost->details->addViewer(stream); bestHost->details->addViewer(stream);
H.SetBody(bestHost->details->host); H.SetBody(bestHost->details->host);
} }
if (proto != "" && bestHost && bestScore){
H.Clean();
H.SetHeader("Location", bestHost->details->getUrl(stream, proto) + vars);
H.SetBody("<a href=\""+H.GetHeader("Location")+"\">Click here for stream</a>");
H.SendResponse("307", "Redirecting", conn);
H.Clean();
}else{
H.SendResponse("200", "OK", conn); H.SendResponse("200", "OK", conn);
H.Clean(); H.Clean();
}
}// if HTTP request received }// if HTTP request received
} }
conn.close(); conn.close();
@ -544,7 +586,7 @@ void handleServer(void *hostEntryPointer){
unsigned int startTime = Util::epoch(); unsigned int startTime = Util::epoch();
while (cfg->is_active && servConn && while (cfg->is_active && servConn &&
!((servConn.spool() || servConn.Received().size()) && H.Read(servConn))){ !((servConn.spool() || servConn.Received().size()) && H.Read(servConn))){
if (Util::epoch() - startTime > 10){ if (Util::epoch() - startTime > 25){
FAIL_MSG("Server %s timed out", host.c_str()); FAIL_MSG("Server %s timed out", host.c_str());
servConn.close(); servConn.close();
H.Clean(); H.Clean();