Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

daemon: if a log file has a /, interpret it from the cwd 

rather than from data dir where it normally is.

It makes things like --log-file ./foo.log behave as you'd expect.
This commit is contained in:
moneromooo-monero 2019-04-13 11:20:14 +00:00
parent 9c77dbf376
commit 5140c15e56
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/daemon/main.cpp
View File

@ -257,6 +257,11 @@ int main(int argc, char const * argv[])
bf::path log_file_path {data_dir / std::string(CRYPTONOTE_NAME ".log")}; bf::path log_file_path {data_dir / std::string(CRYPTONOTE_NAME ".log")};
if (!command_line::is_arg_defaulted(vm, daemon_args::arg_log_file)) if (!command_line::is_arg_defaulted(vm, daemon_args::arg_log_file))
log_file_path = command_line::get_arg(vm, daemon_args::arg_log_file); log_file_path = command_line::get_arg(vm, daemon_args::arg_log_file);
#ifdef __WIN32
if (!strchr(log_file_path.c_str(), '/') && !strchr(log_file_path.c_str(), '\\'))
#else
if (!strchr(log_file_path.c_str(), '/'))
#endif
log_file_path = bf::absolute(log_file_path, relative_path_base); log_file_path = bf::absolute(log_file_path, relative_path_base);
mlog_configure(log_file_path.string(), true, command_line::get_arg(vm, daemon_args::arg_max_log_file_size), command_line::get_arg(vm, daemon_args::arg_max_log_files)); mlog_configure(log_file_path.string(), true, command_line::get_arg(vm, daemon_args::arg_max_log_file_size), command_line::get_arg(vm, daemon_args::arg_max_log_files));