From bd8eaf6a5fe73061efea4f1b80f15eb603b48d3a Mon Sep 17 00:00:00 2001 From: adamdreger Date: Sun, 22 Apr 2018 20:17:18 +0200 Subject: [PATCH] Remove redundant pool connection msg code --- xmrstak/misc/executor.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 8c454ebc1..969cd4bbd 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -193,10 +193,7 @@ void executor::eval_pool_choice() { if(!goal->is_running() && goal->can_connect()) { - if(dev_time) - printer::inst()->print_msg(L1, "Connecting to dev pool ..."); - else - printer::inst()->print_msg(L1, "Connecting to %s pool ...", goal->get_pool_addr()); + printer::inst()->print_msg(L1, "Connecting to %s pool...", dev_time ? "dev" : goal->get_pool_addr()); std::string error; if(!goal->connect(error)) @@ -321,11 +318,7 @@ jpsock* executor::pick_pool_by_id(size_t pool_id) void executor::on_sock_ready(size_t pool_id) { jpsock* pool = pick_pool_by_id(pool_id); - - if(pool->is_dev_pool()) - printer::inst()->print_msg(L1, "Dev pool connected. Logging in..."); - else - printer::inst()->print_msg(L1, "Pool %s connected. Logging in...", pool->get_pool_addr()); + printer::inst()->print_msg(L1, "%s connected. Logging in...", pool->is_dev_pool() ? "Dev pool" : pool->get_pool_addr()); if(!pool->cmd_login()) { @@ -334,7 +327,7 @@ void executor::on_sock_ready(size_t pool_id) std::string str = "Login error: " + pool->get_call_error(); log_socket_error(pool, std::move(str)); } - + if(!pool->have_sock_error()) pool->disconnect(); }