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

Tweaked load balancer verbosity levels

Browse source
This commit is contained in:
Thulinma 2016-07-21 14:37:29 +02:00
parent 4edeb9f63f
commit 4e35165f3d
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/analysers/load_analyser.cpp
View file

@ -275,17 +275,19 @@ void handleServer(void * servName){
hosts[host].availBandwidth = bandwidth.asInt(); hosts[host].availBandwidth = bandwidth.asInt();
INFO_MSG("Monitoring %s on port %d.", host.c_str(), port, passphrase.c_str()); INFO_MSG("Monitoring %s on port %d.", host.c_str(), port, passphrase.c_str());
down = true;
Socket::Connection servConn(host, port, false); Socket::Connection servConn(host, port, false);
while (cfg->is_active){ while (cfg->is_active){
if (!servConn){ if (!servConn){
INFO_MSG("Reconnecting to %s", host.c_str()); WARN_MSG("Reconnecting to %s", host.c_str());
servConn = Socket::Connection(host, port, false); servConn = Socket::Connection(host, port, false);
} }
if (!servConn){ if (!servConn){
INFO_MSG("Can't reach server %s", host.c_str()); FAIL_MSG("Can't reach server %s", host.c_str());
hosts[host].badNess(); hosts[host].badNess();
Util::wait(5000); Util::wait(5000);
down = true;
continue; continue;
} }
@ -304,10 +306,15 @@ void handleServer(void * servName){
} }
JSON::Value servData = JSON::fromString(H.body); JSON::Value servData = JSON::fromString(H.body);
if (!servData){ if (!servData){
INFO_MSG("Can't retrieve server %s load information", host.c_str()); FAIL_MSG("Can't retrieve server %s load information", host.c_str());
down = true;
hosts[host].badNess(); hosts[host].badNess();
servConn.close(); servConn.close();
}else{ }else{
if (down){
WARN_MSG("Connection established with %s", host.c_str());
down = false;
}
hosts[host].update(servData); hosts[host].update(servData);
} }
H.Clean(); H.Clean();
@ -360,7 +367,7 @@ int main(int argc, char ** argv){
passphrase = conf.getOption("passphrase").asStringRef(); passphrase = conf.getOption("passphrase").asStringRef();
JSON::Value & nodes = conf.getOption("server", true); JSON::Value & nodes = conf.getOption("server", true);
INFO_MSG("Load balancer activating. Balancing between %llu nodes.", nodes.size()); WARN_MSG("Load balancer activating. Balancing between %llu nodes.", nodes.size());
conf.activate(); conf.activate();
std::map<std::string, tthread::thread *> threads; std::map<std::string, tthread::thread *> threads;
@ -370,9 +377,9 @@ int main(int argc, char ** argv){
conf.serveThreadedSocket(handleRequest); conf.serveThreadedSocket(handleRequest);
if (!conf.is_active){ if (!conf.is_active){
INFO_MSG("Load balancer shutting down; received shutdown signal"); WARN_MSG("Load balancer shutting down; received shutdown signal");
}else{ }else{
INFO_MSG("Load balancer shutting down; socket problem"); WARN_MSG("Load balancer shutting down; socket problem");
} }
if (threads.size()){ if (threads.size()){