From 814c1d61b32bb04670b86765672f21a699d2c9a4 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 7 Jan 2025 10:40:15 +0000 Subject: [PATCH] Merge pull request #2517 from aarongreig/aaron/fixValgrindWarnInLogger Use std::string in create_logger to avoid valgrind warning in some configs --- source/common/logger/ur_logger.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/common/logger/ur_logger.hpp b/source/common/logger/ur_logger.hpp index c4dc655444..786bd32a00 100644 --- a/source/common/logger/ur_logger.hpp +++ b/source/common/logger/ur_logger.hpp @@ -118,16 +118,15 @@ inline Logger create_logger(std::string logger_name, bool skip_prefix, logger::Level default_log_level) { std::transform(logger_name.begin(), logger_name.end(), logger_name.begin(), ::toupper); - std::stringstream env_var_name; const auto default_flush_level = logger::Level::ERR; const std::string default_output = "stderr"; auto level = default_log_level; auto flush_level = default_flush_level; std::unique_ptr sink; - env_var_name << "UR_LOG_" << logger_name; + auto env_var_name = "UR_LOG_" + logger_name; try { - auto map = getenv_to_map(env_var_name.str().c_str()); + auto map = getenv_to_map(env_var_name.c_str()); if (!map.has_value()) { return Logger( default_log_level, @@ -173,7 +172,7 @@ inline Logger create_logger(std::string logger_name, bool skip_prefix, skip_linebreak); } catch (const std::invalid_argument &e) { std::cerr << "Error when creating a logger instance from the '" - << env_var_name.str() << "' environment variable:\n" + << env_var_name << "' environment variable:\n" << e.what() << std::endl; return Logger(default_log_level, std::make_unique(