From 652c9e3156744111839c226a8f6e6c725f06568a Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Sat, 4 May 2019 10:41:05 +0100 Subject: [PATCH 1/5] Print info about network and path, when running daemon --- nano/lib/config.hpp | 5 +++++ nano/nano_node/daemon.cpp | 5 +++++ nano/node/node.cpp | 3 ++- nano/qt/qt.cpp | 10 +++------- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/nano/lib/config.hpp b/nano/lib/config.hpp index dddbb4e9fd..13dd9d2e29 100644 --- a/nano/lib/config.hpp +++ b/nano/lib/config.hpp @@ -134,6 +134,11 @@ class network_constants return current_network == nano_networks::nano_test_network; } + std::string active_network_label () + { + return is_live_network () ? "live" : is_beta_network () ? "beta" : "test"; + } + /** Initial value is ACTIVE_NETWORK compile flag, but can be overridden by a CLI flag */ static nano::nano_networks active_network; }; diff --git a/nano/nano_node/daemon.cpp b/nano/nano_node/daemon.cpp index 72d927719c..00c4715fd3 100644 --- a/nano/nano_node/daemon.cpp +++ b/nano/nano_node/daemon.cpp @@ -45,6 +45,11 @@ void nano_daemon::daemon::run (boost::filesystem::path const & data_path, nano:: auto node (std::make_shared (init, io_ctx, data_path, alarm, config.node, opencl_work, flags)); if (!init.error ()) { + const std::string network_label = node->network_params.network.active_network_label (); + const std::string version = (NANO_VERSION_PATCH == 0) ? NANO_MAJOR_MINOR_VERSION : NANO_MAJOR_MINOR_RC_VERSION; + std::cout << "Network: " << network_label << ", version: " << version << std::endl + << "Path: " << node->application_path.string () << std::endl; + node->start (); nano::ipc::ipc_server ipc_server (*node, config.rpc); #if BOOST_PROCESS_SUPPORTED diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 5a6d1d6f2b..f94c005e85 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1220,6 +1220,8 @@ startup_time (std::chrono::steady_clock::now ()) } }); } + const std::string network_label = network_params.network.active_network_label (); + logger.always_log ("Active network: ", network_label); if (NANO_VERSION_PATCH == 0) { logger.always_log ("Node starting, version: ", NANO_MAJOR_MINOR_VERSION); @@ -1228,7 +1230,6 @@ startup_time (std::chrono::steady_clock::now ()) { logger.always_log ("Node starting, version: ", NANO_MAJOR_MINOR_RC_VERSION); } - logger.always_log (boost::str (boost::format ("Work pool running %1% threads") % work.threads.size ())); if (!init_a.error ()) { diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index 0325852a01..10912a3400 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -72,14 +72,10 @@ balance_label (new QLabel), wallet (wallet_a) { your_account_label->setStyleSheet ("font-weight: bold;"); - std::string network = "Live"; - if (wallet.node.network_params.network.is_beta_network ()) + std::string network = wallet.node.network_params.active_network_label (); + if (!network.empty ()) { - network = "Beta"; - } - else if (wallet.node.network_params.network.is_test_network ()) - { - network = "Test"; + network[0] = std::toupper (network[0]); } if (NANO_VERSION_PATCH == 0) { From b20df37786739795a27d7328bc0809f7633da3b4 Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Sat, 4 May 2019 11:41:10 +0100 Subject: [PATCH 2/5] Fix wallet build --- nano/qt/qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index 10912a3400..f390e5f5cb 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -72,7 +72,7 @@ balance_label (new QLabel), wallet (wallet_a) { your_account_label->setStyleSheet ("font-weight: bold;"); - std::string network = wallet.node.network_params.active_network_label (); + std::string network = wallet.node.network_params.network.active_network_label (); if (!network.empty ()) { network[0] = std::toupper (network[0]); From 885ee95d342ab6f221dc6c835bf835786a5f801d Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Mon, 6 May 2019 13:27:46 +0100 Subject: [PATCH 3/5] Use method introduced in #1957 --- nano/lib/config.hpp | 5 ----- nano/nano_node/daemon.cpp | 4 ++-- nano/node/node.cpp | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nano/lib/config.hpp b/nano/lib/config.hpp index 13dd9d2e29..dddbb4e9fd 100644 --- a/nano/lib/config.hpp +++ b/nano/lib/config.hpp @@ -134,11 +134,6 @@ class network_constants return current_network == nano_networks::nano_test_network; } - std::string active_network_label () - { - return is_live_network () ? "live" : is_beta_network () ? "beta" : "test"; - } - /** Initial value is ACTIVE_NETWORK compile flag, but can be overridden by a CLI flag */ static nano::nano_networks active_network; }; diff --git a/nano/nano_node/daemon.cpp b/nano/nano_node/daemon.cpp index 00c4715fd3..87d1297a55 100644 --- a/nano/nano_node/daemon.cpp +++ b/nano/nano_node/daemon.cpp @@ -45,8 +45,8 @@ void nano_daemon::daemon::run (boost::filesystem::path const & data_path, nano:: auto node (std::make_shared (init, io_ctx, data_path, alarm, config.node, opencl_work, flags)); if (!init.error ()) { - const std::string network_label = node->network_params.network.active_network_label (); - const std::string version = (NANO_VERSION_PATCH == 0) ? NANO_MAJOR_MINOR_VERSION : NANO_MAJOR_MINOR_RC_VERSION; + auto network_label = node->network_params.network.get_current_network_as_string (); + auto version = (NANO_VERSION_PATCH == 0) ? NANO_MAJOR_MINOR_VERSION : NANO_MAJOR_MINOR_RC_VERSION; std::cout << "Network: " << network_label << ", version: " << version << std::endl << "Path: " << node->application_path.string () << std::endl; diff --git a/nano/node/node.cpp b/nano/node/node.cpp index f94c005e85..939031e9ef 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -1220,7 +1220,7 @@ startup_time (std::chrono::steady_clock::now ()) } }); } - const std::string network_label = network_params.network.active_network_label (); + auto network_label = network_params.network.get_current_network_as_string (); logger.always_log ("Active network: ", network_label); if (NANO_VERSION_PATCH == 0) { From 510065b51ea64692ddbdada984228cad192d6784 Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Mon, 6 May 2019 13:58:26 +0100 Subject: [PATCH 4/5] Fix wallet build again --- nano/qt/qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index f390e5f5cb..dddc643e0b 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -72,7 +72,7 @@ balance_label (new QLabel), wallet (wallet_a) { your_account_label->setStyleSheet ("font-weight: bold;"); - std::string network = wallet.node.network_params.network.active_network_label (); + std::string network = wallet.node.network_params.network.get_current_network_as_string (); if (!network.empty ()) { network[0] = std::toupper (network[0]); From 7fc119a0c06768aea6e6f24110612d02e4988d64 Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Thu, 30 May 2019 17:08:05 +0100 Subject: [PATCH 5/5] log order --- nano/node/node.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 4b0dbd3be3..59763f4cb1 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -406,8 +406,6 @@ startup_time (std::chrono::steady_clock::now ()) }); } - auto network_label = network_params.network.get_current_network_as_string (); - logger.always_log ("Active network: ", network_label); if (NANO_VERSION_PATCH == 0) { logger.always_log ("Node starting, version: ", NANO_MAJOR_MINOR_VERSION); @@ -417,6 +415,9 @@ startup_time (std::chrono::steady_clock::now ()) logger.always_log ("Node starting, version: ", NANO_MAJOR_MINOR_RC_VERSION); } + auto network_label = network_params.network.get_current_network_as_string (); + logger.always_log ("Active network: ", network_label); + logger.always_log (boost::str (boost::format ("Work pool running %1% threads") % work.threads.size ())); if (config.logging.node_lifetime_tracing ())