mirror of
https://github.com/jwinterm/wownero.git
synced 2026-11-17 09:34:07 +01:00
options: add testnet option dependencies
This commit is contained in:
@@ -31,20 +31,35 @@
|
||||
|
||||
#include "common/command_line.h"
|
||||
#include "cryptonote_config.h"
|
||||
#include "daemonizer/daemonizer.h"
|
||||
|
||||
namespace daemon_args
|
||||
{
|
||||
std::string const WINDOWS_SERVICE_NAME = "Monero Daemon";
|
||||
|
||||
const command_line::arg_descriptor<std::string> arg_config_file = {
|
||||
const command_line::arg_descriptor<std::string, false, true> arg_config_file = {
|
||||
"config-file"
|
||||
, "Specify configuration file"
|
||||
, std::string(CRYPTONOTE_NAME ".conf")
|
||||
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string()
|
||||
, cryptonote::arg_testnet_on
|
||||
, [](bool testnet, bool defaulted, std::string val) {
|
||||
if (testnet && defaulted)
|
||||
return (daemonizer::get_default_data_dir() / "testnet" /
|
||||
std::string(CRYPTONOTE_NAME ".conf")).string();
|
||||
return val;
|
||||
}
|
||||
};
|
||||
const command_line::arg_descriptor<std::string> arg_log_file = {
|
||||
const command_line::arg_descriptor<std::string, false, true> arg_log_file = {
|
||||
"log-file"
|
||||
, "Specify log file"
|
||||
, ""
|
||||
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string()
|
||||
, cryptonote::arg_testnet_on
|
||||
, [](bool testnet, bool defaulted, std::string val) {
|
||||
if (testnet && defaulted)
|
||||
return (daemonizer::get_default_data_dir() / "testnet" /
|
||||
std::string(CRYPTONOTE_NAME ".log")).string();
|
||||
return val;
|
||||
}
|
||||
};
|
||||
const command_line::arg_descriptor<std::size_t> arg_max_log_file_size = {
|
||||
"max-log-file-size"
|
||||
@@ -79,9 +94,13 @@ namespace daemon_args
|
||||
const command_line::arg_descriptor<std::string, false, true> arg_zmq_rpc_bind_port = {
|
||||
"zmq-rpc-bind-port"
|
||||
, "Port for ZMQ RPC server to listen on"
|
||||
, cryptonote::arg_testnet_on
|
||||
, std::to_string(config::testnet::ZMQ_RPC_DEFAULT_PORT)
|
||||
, std::to_string(config::ZMQ_RPC_DEFAULT_PORT)
|
||||
, cryptonote::arg_testnet_on
|
||||
, [](bool testnet, bool defaulted, std::string val) {
|
||||
if (testnet && defaulted)
|
||||
return std::to_string(config::testnet::ZMQ_RPC_DEFAULT_PORT);
|
||||
return val;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace daemon_args
|
||||
|
||||
+2
-7
@@ -73,20 +73,15 @@ int main(int argc, char const * argv[])
|
||||
po::options_description core_settings("Settings");
|
||||
po::positional_options_description positional_options;
|
||||
{
|
||||
bf::path default_data_dir = daemonizer::get_default_data_dir();
|
||||
bf::path default_testnet_data_dir = {default_data_dir / "testnet"};
|
||||
|
||||
// Misc Options
|
||||
|
||||
command_line::add_arg(visible_options, command_line::arg_help);
|
||||
command_line::add_arg(visible_options, command_line::arg_version);
|
||||
command_line::add_arg(visible_options, daemon_args::arg_os_version);
|
||||
bf::path default_conf = default_data_dir / std::string(CRYPTONOTE_NAME ".conf");
|
||||
command_line::add_arg(visible_options, daemon_args::arg_config_file, default_conf.string());
|
||||
command_line::add_arg(visible_options, daemon_args::arg_config_file);
|
||||
|
||||
// Settings
|
||||
bf::path default_log = default_data_dir / std::string(CRYPTONOTE_NAME ".log");
|
||||
command_line::add_arg(core_settings, daemon_args::arg_log_file, default_log.string());
|
||||
command_line::add_arg(core_settings, daemon_args::arg_log_file);
|
||||
command_line::add_arg(core_settings, daemon_args::arg_log_level);
|
||||
command_line::add_arg(core_settings, daemon_args::arg_max_log_file_size);
|
||||
command_line::add_arg(core_settings, daemon_args::arg_max_concurrency);
|
||||
|
||||
Reference in New Issue
Block a user