Merge pull request #2807

61712384 daemon & simplewallet: don't set max-concurrency when unspecified (stoffu)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:51:52 +02:00
commit fbfdaae06f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions

View File

@ -278,7 +278,7 @@ int main(int argc, char const * argv[])
tools::set_stack_trace_log(log_file_path.filename().string()); tools::set_stack_trace_log(log_file_path.filename().string());
#endif // STACK_TRACE #endif // STACK_TRACE
if (command_line::has_arg(vm, daemon_args::arg_max_concurrency)) if (!command_line::is_arg_defaulted(vm, daemon_args::arg_max_concurrency))
tools::set_max_concurrency(command_line::get_arg(vm, daemon_args::arg_max_concurrency)); tools::set_max_concurrency(command_line::get_arg(vm, daemon_args::arg_max_concurrency));
// logging is now set up // logging is now set up

View File

@ -178,7 +178,7 @@ namespace wallet_args
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
} }
if(command_line::has_arg(vm, arg_max_concurrency)) if (!command_line::is_arg_defaulted(vm, arg_max_concurrency))
tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency)); tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency));
Print(print) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; Print(print) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";