Print pool urls in summary.

This commit is contained in:
XMRig 2017-06-16 11:32:34 +03:00
parent fed163568e
commit b8089e637a
2 changed files with 24 additions and 16 deletions

View file

@ -28,6 +28,7 @@
#include "Console.h" #include "Console.h"
#include "Cpu.h" #include "Cpu.h"
#include "Mem.h" #include "Mem.h"
#include "net/Url.h"
#include "Options.h" #include "Options.h"
#include "Summary.h" #include "Summary.h"
#include "version.h" #include "version.h"
@ -99,22 +100,28 @@ static void print_threads()
buf[0] = '\0'; buf[0] = '\0';
} }
if (Options::i()->colors()) { Console::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mTHREADS: \x1B[01;36m%d\x1B[01;37m, %s, av=%d, donate=%d%%%s%s" : " * THREADS: %d, %s, av=%d, donate=%d%%%s%s",
Console::i()->text("\x1B[01;32m * \x1B[01;37mTHREADS: \x1B[01;36m%d\x1B[01;37m, %s, av=%d, donate=%d%%%s%s",
Options::i()->threads(),
Options::i()->algoName(),
Options::i()->algoVariant(),
Options::i()->donateLevel(),
Options::i()->nicehash() ? ", nicehash" : "", buf);
}
else {
Console::i()->text(" * THREADS: %d, %s, av=%d, donate=%d%%%s%s",
Options::i()->threads(), Options::i()->threads(),
Options::i()->algoName(), Options::i()->algoName(),
Options::i()->algoVariant(), Options::i()->algoVariant(),
Options::i()->donateLevel(), Options::i()->donateLevel(),
Options::i()->nicehash() ? ", nicehash" : "", buf); Options::i()->nicehash() ? ", nicehash" : "", buf);
}
static void print_pools()
{
Console::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #1: \x1B[01;36m%s:%d" : " * POOL #1: %s:%d",
Options::i()->url()->host(),
Options::i()->url()->port());
if (!Options::i()->backupUrl()) {
return;
} }
Console::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #2: \x1B[01;36m%s:%d" : " * POOL #2: %s:%d",
Options::i()->backupUrl()->host(),
Options::i()->backupUrl()->port());
} }
@ -124,6 +131,7 @@ void Summary::print()
print_memory(); print_memory();
print_cpu(); print_cpu();
print_threads(); print_threads();
print_pools();
} }

View file

@ -27,7 +27,7 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "Monero (XMR) CPU miner" #define APP_DESC "Monero (XMR) CPU miner"
#define APP_VERSION "1.0.0-dev" #define APP_VERSION "1.0.0"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com"