mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-30 19:03:04 +00:00
Code Issues Releases Wiki Activity

fix: don't log full path, only the filename of source file (#5055)

Browse source 
Co-authored-by: Akos Horvath <koma@koma.sh>
This commit is contained in:
HAkos1 2023-02-27 17:02:58 +01:00 committed by GitHub
parent 13ae244eed
commit 238fd96041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libtransmission/log.cc
View file

@ -86,7 +86,7 @@ tr_sys_file_t tr_logGetFile()
} }
void logAddImpl( void logAddImpl(
[[maybe_unused]] char const* file, [[maybe_unused]] std::string_view file,
[[maybe_unused]] long line, [[maybe_unused]] long line,
[[maybe_unused]] tr_log_level level, [[maybe_unused]] tr_log_level level,
std::string_view msg, std::string_view msg,
@ -245,11 +245,17 @@ void tr_logAddMessage(char const* file, long line, tr_log_level level, std::stri
{ {
TR_ASSERT(!std::empty(msg)); TR_ASSERT(!std::empty(msg));
// strip source path to only include the filename
auto filename = tr_sys_path_basename(file);
if (std::empty(filename))
{
filename = "?"sv;
}
auto name_fallback = std::string{}; auto name_fallback = std::string{};
if (std::empty(name)) if (std::empty(name))
{ {
auto const base = tr_sys_path_basename(file); name_fallback = fmt::format(FMT_STRING("{}:{}"), filename, line);
name_fallback = fmt::format(FMT_STRING("{}:{}"), !std::empty(base) ? base : "?", line);
name = name_fallback; name = name_fallback;
} }
@ -271,9 +277,9 @@ void tr_logAddMessage(char const* file, long line, tr_log_level level, std::stri
if (level == TR_LOG_CRITICAL || level == TR_LOG_ERROR || level == TR_LOG_WARN) if (level == TR_LOG_CRITICAL || level == TR_LOG_ERROR || level == TR_LOG_WARN)
{ {
static auto constexpr MaxRepeat = size_t{ 30 }; static auto constexpr MaxRepeat = size_t{ 30 };
static auto counts = new std::map<std::pair<char const*, int>, size_t>{}; static auto counts = new std::map<std::pair<std::string_view, int>, size_t>{};
auto& count = (*counts)[std::make_pair(file, line)]; auto& count = (*counts)[std::make_pair(filename, line)];
++count; ++count;
last_one = count == MaxRepeat; last_one = count == MaxRepeat;
if (count > MaxRepeat) if (count > MaxRepeat)
@ -284,10 +290,15 @@ void tr_logAddMessage(char const* file, long line, tr_log_level level, std::stri
} }
// log the messages // log the messages
logAddImpl(file, line, level, msg, name); logAddImpl(filename, line, level, msg, name);
if (last_one) if (last_one)
{ {
logAddImpl(file, line, level, _("Too many messages like this! I won't log this message anymore this session."), name); logAddImpl(
filename,
line,
level,
_("Too many messages like this! I won't log this message anymore this session."),
name);
} }
errno = err; errno = err;