monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1897

Browse source 
44a5b038 create a foreground non-interactive mode (Noah Watkins)
This commit is contained in:
Riccardo Spagni 2017-03-21 14:10:36 +02:00
commit 4b34531307
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/daemon/executor.cpp
View file

@ -63,6 +63,13 @@ namespace daemonize
return t_daemon{vm};
}
bool t_executor::run_non_interactive(
boost::program_options::variables_map const & vm
)
{
return t_daemon{vm}.run(false);
}
bool t_executor::run_interactive(
boost::program_options::variables_map const & vm
)

4
src/daemon/executor.h
View file

@ -56,6 +56,10 @@ namespace daemonize
boost::program_options::variables_map const & vm
);
bool run_non_interactive(
boost::program_options::variables_map const & vm
);
bool run_interactive(
boost::program_options::variables_map const & vm
);

9
src/daemonizer/posix_daemonizer.inl
View file

@ -43,6 +43,10 @@ namespace daemonizer
"detach"
, "Run as daemon"
};
const command_line::arg_descriptor<bool> arg_non_interactive = {
"non-interactive"
, "Run non-interactive"
};
}
inline void init_options(
@ -51,6 +55,7 @@ namespace daemonizer
)
{
command_line::add_arg(normal_options, arg_detach);
command_line::add_arg(normal_options, arg_non_interactive);
}
inline boost::filesystem::path get_default_data_dir()
@ -79,6 +84,10 @@ namespace daemonizer
auto daemon = executor.create_daemon(vm);
return daemon.run();
}
else if (command_line::has_arg(vm, arg_non_interactive))
{
return executor.run_non_interactive(vm);
}
else
{
//LOG_PRINT_L0("Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL);