Print pools summary if pools changed.

This commit is contained in:
XMRig
2018-03-23 19:29:23 +07:00
parent c0d3e2306d
commit 35f4eff2db
4 changed files with 28 additions and 20 deletions

View File

@@ -65,25 +65,6 @@ static void print_mode(xmrig::Controller *controller)
}
static void print_pools(xmrig::Controller *controller)
{
const std::vector<Url*> &pools = controller->config()->pools();
for (size_t i = 0; i < pools.size(); ++i) {
Log::i()->text(controller->config()->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:\x1B[0m \x1B[36m%s:%d" : " * POOL #%d: %s:%d",
i + 1,
pools[i]->host(),
pools[i]->port());
}
# ifdef APP_DEBUG
for (size_t i = 0; i < pools.size(); ++i) {
Log::i()->text("%s:%d, user: %s, pass: %s", pools[i]->host(), pools[i]->port(), pools[i]->user(), pools[i]->password());
}
# endif
}
static void print_bind(xmrig::Controller *controller)
{
const std::vector<Addr*> &addrs = controller->config()->addrs();
@@ -128,7 +109,7 @@ void Summary::print(xmrig::Controller *controller)
{
print_versions(controller);
print_mode(controller);
print_pools(controller);
printPools(controller->config());
print_bind(controller);
# ifndef XMRIG_NO_API
@@ -139,4 +120,23 @@ void Summary::print(xmrig::Controller *controller)
}
void Summary::printPools(xmrig::Config *config)
{
const std::vector<Url*> &pools = config->pools();
for (size_t i = 0; i < pools.size(); ++i) {
Log::i()->text(config->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:\x1B[0m \x1B[36m%s:%d" : " * POOL #%d: %s:%d",
i + 1,
pools[i]->host(),
pools[i]->port());
}
# ifdef APP_DEBUG
for (size_t i = 0; i < pools.size(); ++i) {
Log::i()->text("%s:%d, user: %s, pass: %s", pools[i]->host(), pools[i]->port(), pools[i]->user(), pools[i]->password());
}
# endif
}

View File

@@ -26,6 +26,7 @@
namespace xmrig {
class Config;
class Controller;
}
@@ -34,6 +35,7 @@ class Summary
{
public:
static void print(xmrig::Controller *controller);
static void printPools(xmrig::Config *config);
};

View File

@@ -35,6 +35,7 @@
#include "proxy/Miner.h"
#include "proxy/splitters/nicehash/NonceMapper.h"
#include "proxy/splitters/nicehash/NonceSplitter.h"
#include "Summary.h"
#define LABEL(x) " \x1B[01;30m" x ":\x1B[0m "
@@ -146,6 +147,8 @@ void NonceSplitter::onConfigChanged(xmrig::Config *config, xmrig::Config *previo
const std::vector<Url*> &previousPools = previousConfig->pools();
if (pools.size() != previousPools.size() || !std::equal(pools.begin(), pools.end(), previousPools.begin(), compare)) {
Summary::printPools(config);
for (NonceMapper *mapper : m_upstreams) {
mapper->reload(pools);
}

View File

@@ -36,6 +36,7 @@
#include "proxy/Miner.h"
#include "proxy/splitters/simple/SimpleMapper.h"
#include "proxy/splitters/simple/SimpleSplitter.h"
#include "Summary.h"
#define LABEL(x) " \x1B[01;30m" x ":\x1B[0m "
@@ -145,6 +146,8 @@ void SimpleSplitter::onConfigChanged(xmrig::Config *config, xmrig::Config *previ
const std::vector<Url*> &previousPools = previousConfig->pools();
if (pools.size() != previousPools.size() || !std::equal(pools.begin(), pools.end(), previousPools.begin(), compare)) {
Summary::printPools(config);
for (auto const &kv : m_upstreams) {
kv.second->reload(pools);
}