diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-02 22:41:28 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-02 22:41:28 +0200 |
| commit | fcb299b4aedf1b4f465c36f2114290a0a5f3f062 (patch) | |
| tree | a206fd1c33ab4e71aa4af8eb5bec43735cfbaeb1 | |
| parent | Merge pull request #1656 (diff) | |
| parent | Separate data per P2P port (diff) | |
| download | monero-fcb299b4aedf1b4f465c36f2114290a0a5f3f062.tar.xz | |
Merge pull request #1641
ca94d0a4 Separate data per P2P port (Miguel Herranz)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 12 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 5ddedd6fd..900dc58ba 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -41,6 +41,7 @@ using namespace epee; #include "cryptonote_format_utils.h" #include "misc_language.h" #include <csignal> +#include <p2p/net_node.h> #include "cryptonote_core/checkpoints.h" #include "ringct/rctTypes.h" #include "blockchain_db/blockchain_db.h" @@ -258,8 +259,17 @@ namespace cryptonote m_fakechain = test_options != NULL; bool r = handle_command_line(vm); + bool testnet = command_line::get_arg(vm, command_line::arg_testnet_on); + auto p2p_bind_arg = testnet ? nodetool::arg_testnet_p2p_bind_port : nodetool::arg_p2p_bind_port; + std::string m_port = command_line::get_arg(vm, p2p_bind_arg); + std::string m_config_folder_mempool = m_config_folder; + + if ((!testnet && m_port != std::to_string(::config::P2P_DEFAULT_PORT)) + || (testnet && m_port != std::to_string(::config::testnet::P2P_DEFAULT_PORT))) { + m_config_folder_mempool = m_config_folder_mempool + "/" + m_port; + } - r = m_mempool.init(m_fakechain ? std::string() : m_config_folder); + r = m_mempool.init(m_fakechain ? std::string() : m_config_folder_mempool); CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool"); std::string db_type = command_line::get_arg(vm, command_line::arg_db_type); diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index d67c5dd93..7ab6a4894 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -505,6 +505,11 @@ namespace nodetool auto config_arg = testnet ? command_line::arg_testnet_data_dir : command_line::arg_data_dir; m_config_folder = command_line::get_arg(vm, config_arg); + if ((!testnet && m_port != std::to_string(::config::P2P_DEFAULT_PORT)) + || (testnet && m_port != std::to_string(::config::testnet::P2P_DEFAULT_PORT))) { + m_config_folder = m_config_folder + "/" + m_port; + } + res = init_config(); CHECK_AND_ASSERT_MES(res, false, "Failed to init config."); |