4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to console logger setup

Browse Source
This commit is contained in:
Zachary Michaels 2014-06-24 22:27:40 +00:00
parent 75d75e8f75
commit e2ef6983ff
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/daemon/daemon.cpp
View File

@ -154,6 +154,29 @@ int main(int argc, char* argv[])
po::notify(vm); po::notify(vm);
} }
// Start with log level 0
log_space::get_set_log_detalisation_level(true, LOG_LEVEL_0);
// Add console logger if we're not forking
if (!command_line::arg_present(vm, arg_detach))
{
log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
}
// Set log level
{
int new_log_level = command_line::get_arg(vm, arg_log_level);
if(new_log_level < LOG_LEVEL_MIN || new_log_level > LOG_LEVEL_MAX)
{
LOG_PRINT_L0("Wrong log level value: " << new_log_level);
}
else if (log_space::get_set_log_detalisation_level(false) != new_log_level)
{
log_space::get_set_log_detalisation_level(true, new_log_level);
LOG_PRINT_L0("LOG_LEVEL set to " << new_log_level);
}
}
// If there are positional options, we're running a daemon command // If there are positional options, we're running a daemon command
if (command_line::arg_present(vm, arg_command)) if (command_line::arg_present(vm, arg_command))
{ {
@ -202,35 +225,17 @@ int main(int argc, char* argv[])
log_space::log_singletone::add_logger(LOGGER_FILE, log_file_path.filename().string().c_str(), log_dir.c_str()); log_space::log_singletone::add_logger(LOGGER_FILE, log_file_path.filename().string().c_str(), log_dir.c_str());
} }
log_space::get_set_log_detalisation_level(true, LOG_LEVEL_0);
#ifndef WIN32 #ifndef WIN32
if (command_line::arg_present(vm, arg_detach)) { if (command_line::arg_present(vm, arg_detach))
{
std::cout << "forking to background..." << std::endl; std::cout << "forking to background..." << std::endl;
posix_fork(); posix_fork();
} else {
log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
} }
#else
log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
#endif #endif
// Begin logging // Begin logging
LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG); LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG);
// Set log level
{
int new_log_level = command_line::get_arg(vm, arg_log_level);
if(new_log_level < LOG_LEVEL_MIN || new_log_level > LOG_LEVEL_MAX)
{
LOG_PRINT_L0("Wrong log level value: " << new_log_level);
}
else if (log_space::get_set_log_detalisation_level(false) != new_log_level)
{
log_space::get_set_log_detalisation_level(true, new_log_level);
LOG_PRINT_L0("LOG_LEVEL set to " << new_log_level);
}
}
bool res = true; bool res = true;
cryptonote::checkpoints checkpoints; cryptonote::checkpoints checkpoints;
res = cryptonote::create_checkpoints(checkpoints); res = cryptonote::create_checkpoints(checkpoints);