Merge pull request #5435

5140c15e daemon: if a log file has a /, interpret it from the cwd (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-16 22:42:26 +02:00
commit b0472c43a1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 1 deletions

View File

@ -257,7 +257,12 @@ int main(int argc, char const * argv[])
bf::path log_file_path {data_dir / std::string(CRYPTONOTE_NAME ".log")};
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 = bf::absolute(log_file_path, relative_path_base);
#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);
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));
// Set log level