monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 19:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

epee: fix mlog filename compare bug.

Browse source 
When using a relative path for the log filename,
since the iteration on files adds "./" to the beginning of the filename
monero-wallet-rpc and monero-wallet-cli	cannot find already written
log files and therefore rotate indefinitely.
This commit is contained in:
0xFFFC0000 2024-07-07 21:13:12 +00:00
parent cc73fe7116
commit b8940420bb
No known key found for this signature in database
GPG key ID: 650F7C2B7BDA3819
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/epee/src/mlog.cpp
View file

@ -176,11 +176,12 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
std::vector<boost::filesystem::path> found_files; std::vector<boost::filesystem::path> found_files;
const boost::filesystem::directory_iterator end_itr; const boost::filesystem::directory_iterator end_itr;
const boost::filesystem::path filename_base_path(filename_base); const boost::filesystem::path filename_base_path(filename_base);
const std::string filename_base_name = filename_base_path.filename().string();
const boost::filesystem::path parent_path = filename_base_path.has_parent_path() ? filename_base_path.parent_path() : "."; const boost::filesystem::path parent_path = filename_base_path.has_parent_path() ? filename_base_path.parent_path() : ".";
for (boost::filesystem::directory_iterator iter(parent_path); iter != end_itr; ++iter) for (boost::filesystem::directory_iterator iter(parent_path); iter != end_itr; ++iter)
{ {
const std::string filename = iter->path().string(); const std::string filename = iter->path().filename().string();
if (filename.size() >= filename_base.size() && std::memcmp(filename.data(), filename_base.data(), filename_base.size()) == 0) if (filename.size() >= filename_base_name.size() && std::memcmp(filename.data(), filename_base_name.data(), filename_base_name.size()) == 0)
{ {
found_files.push_back(iter->path()); found_files.push_back(iter->path());
} }