daemon: Set log file default to use data dir
The log file previously used the default data dir even if --data-dir was set to something else. Document data dir and log file path.
This commit is contained in:
parent
deacecc15e
commit
10ff75e92e
1 changed files with 16 additions and 1 deletions
|
@ -155,6 +155,12 @@ int main(int argc, char const * argv[])
|
|||
|
||||
auto data_dir_arg = testnet_mode ? command_line::arg_testnet_data_dir : command_line::arg_data_dir;
|
||||
|
||||
// data_dir
|
||||
// default: e.g. ~/.bitmonero/ or ~/.bitmonero/testnet
|
||||
// if data-dir argument given:
|
||||
// absolute path
|
||||
// relative path: relative to cwd
|
||||
|
||||
// Create data dir if it doesn't exist
|
||||
boost::filesystem::path data_dir = boost::filesystem::absolute(
|
||||
command_line::get_arg(vm, data_dir_arg));
|
||||
|
@ -238,9 +244,18 @@ int main(int argc, char const * argv[])
|
|||
}
|
||||
}
|
||||
|
||||
// log_file_path
|
||||
// default: <data_dir>/<CRYPTONOTE_NAME>.log
|
||||
// if log-file argument given:
|
||||
// absolute path
|
||||
// relative path: relative to data_dir
|
||||
|
||||
// Set log file
|
||||
{
|
||||
bf::path log_file_path{bf::absolute(command_line::get_arg(vm, daemon_args::arg_log_file), relative_path_base)};
|
||||
bf::path log_file_path {data_dir / std::string(CRYPTONOTE_NAME ".log")};
|
||||
if (! vm["log-file"].defaulted())
|
||||
log_file_path = command_line::get_arg(vm, daemon_args::arg_log_file);
|
||||
log_file_path = bf::absolute(log_file_path, relative_path_base);
|
||||
|
||||
epee::log_space::log_singletone::add_logger(
|
||||
LOGGER_FILE
|
||||
|
|
Loading…
Reference in a new issue