diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-05-12 15:14:30 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-05-12 15:14:30 +0300 |
| commit | 2d799097ca8467f27c684ba36152ff4e83c6ad28 (patch) | |
| tree | 023ca29ac16e5a9198920eaeb1e9dea59544e9b3 /src/daemon/main.cpp | |
| parent | 5dbd2b8fc3aa97f3a2e14a378cf6b7afd16bd4e2 (diff) | |
| parent | 8b0d22a2aa5f4a1539f40e276feca3b1879924eb (diff) | |
| download | monzero-core-2d799097ca8467f27c684ba36152ff4e83c6ad28.tar.gz monzero-core-2d799097ca8467f27c684ba36152ff4e83c6ad28.tar.xz monzero-core-2d799097ca8467f27c684ba36152ff4e83c6ad28.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/daemon/main.cpp')
| -rw-r--r-- | src/daemon/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index 0717fd89b..bfd829dea 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -81,6 +81,7 @@ int main(int argc, char const * argv[]) 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_level); + command_line::add_arg(core_settings, daemon_args::arg_max_concurrency); daemonizer::init_options(hidden_options, visible_options); daemonize::t_executor::init_options(core_settings); @@ -260,6 +261,9 @@ int main(int argc, char const * argv[]) ); } + if (command_line::has_arg(vm, daemon_args::arg_max_concurrency)) + tools::set_max_concurrency(command_line::get_arg(vm, daemon_args::arg_max_concurrency)); + _note_c("dbg/main", "Moving from main() into the daemonize now."); return daemonizer::daemonize(argc, argv, daemonize::t_executor{}, vm); |