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

Added fallback option to load analyser

Browse source
This commit is contained in:
Thulinma 2017-01-10 12:00:33 +01:00
parent 0c0bb5b3bf
commit 055c87a2b3
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/analysers/load_analyser.cpp
View file

@ -11,6 +11,8 @@
Util::Config * cfg = 0; Util::Config * cfg = 0;
std::string passphrase; std::string passphrase;
std::string fallback;
unsigned int weight_cpu = 500; unsigned int weight_cpu = 500;
unsigned int weight_ram = 500; unsigned int weight_ram = 500;
unsigned int weight_bw = 1000; unsigned int weight_bw = 1000;
@ -270,7 +272,7 @@ int handleRequest(Socket::Connection & conn){
} }
} }
if (bestScore == 0){ if (bestScore == 0){
bestHost = "FULL"; bestHost = fallback;
FAIL_MSG("All servers seem to be out of bandwidth!"); FAIL_MSG("All servers seem to be out of bandwidth!");
}else{ }else{
INFO_MSG("Winner: %s scores %u", bestHost.c_str(), bestScore); INFO_MSG("Winner: %s scores %u", bestHost.c_str(), bestScore);
@ -401,6 +403,13 @@ int main(int argc, char ** argv){
opt["value"][0u] = "root"; opt["value"][0u] = "root";
conf.addOption("username", opt); conf.addOption("username", opt);
opt["arg"] = "string";
opt["short"] = "F";
opt["long"] = "fallback";
opt["help"] = "Default reply if no servers are available";
opt["value"][0u] = "FULL";
conf.addOption("fallback", opt);
opt["arg"] = "integer"; opt["arg"] = "integer";
opt["short"] = "R"; opt["short"] = "R";
opt["long"] = "ram"; opt["long"] = "ram";
@ -436,6 +445,7 @@ int main(int argc, char ** argv){
weight_cpu = conf.getInteger("cpu"); weight_cpu = conf.getInteger("cpu");
weight_bw = conf.getInteger("bw"); weight_bw = conf.getInteger("bw");
weight_bonus = conf.getInteger("extra"); weight_bonus = conf.getInteger("extra");
fallback = conf.getString("fallback");
JSON::Value & nodes = conf.getOption("server", true); JSON::Value & nodes = conf.getOption("server", true);
WARN_MSG("Load balancer activating. Balancing between %llu nodes.", nodes.size()); WARN_MSG("Load balancer activating. Balancing between %llu nodes.", nodes.size());