Small fixes.

This commit is contained in:
XMRig 2018-03-31 17:51:33 +07:00
parent 7f5d7cf7dd
commit af0a6fdf20
5 changed files with 14 additions and 3 deletions

View file

@ -91,7 +91,7 @@ App::~App()
int App::exec()
{
if (!m_controller->config()) {
if (!m_controller->isReady()) {
return 2;
}

View file

@ -132,11 +132,13 @@ static void print_pools(xmrig::Config *config)
#ifndef XMRIG_NO_API
static void print_api(xmrig::Config *config)
{
if (config->apiPort() == 0) {
const int port = config->apiPort();
if (port == 0) {
return;
}
Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mAPI PORT: \x1B[01;36m%d" : " * API PORT: %d", config->apiPort());
Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mAPI BIND: \x1B[01;36m%s:%d" : " * API BIND: %s:%d",
config->isApiIPv6() ? "[::]" : "0.0.0.0", port);
}
#endif

View file

@ -56,6 +56,8 @@ xmrig::CommonConfig::CommonConfig() :
m_apiRestricted(true),
m_background(false),
m_colors(true),
m_syslog(false),
m_watch(false), // TODO: enable config file watch by default when this feature propertly handled and tested.
m_apiToken(nullptr),
m_apiWorkerId(nullptr),
m_fileName(nullptr),

View file

@ -79,6 +79,12 @@ xmrig::Controller::~Controller()
}
bool xmrig::Controller::isReady() const
{
return d_ptr->config && d_ptr->network;
}
xmrig::Config *xmrig::Controller::config() const
{
assert(d_ptr->config != nullptr);

View file

@ -46,6 +46,7 @@ public:
Controller();
~Controller();
bool isReady() const;
Config *config() const;
int init(int argc, char **argv);
Network *network() const;