Skip to content

Commit 4cd6e53

Browse files
committed
[UR] Fix logger_validation test
Change intel#17095 introduced a failure in the logger_validation test due to an incorrect merging of the default and "current" log level. This change reverts to the old behavior where an invalid `output` value causes the logger to use the default `level`.
1 parent 5ce93be commit 4cd6e53

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

unified-runtime/source/common/logger/ur_logger.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,21 @@ template <typename T> inline std::string toHex(T t) {
119119
/// to be printed immediately as they occur
120120
/// - output: stderr
121121
inline Logger create_logger(std::string logger_name, bool skip_prefix,
122-
bool skip_linebreak, ur_logger_level_t level) {
122+
bool skip_linebreak,
123+
ur_logger_level_t default_log_level) {
123124
std::transform(logger_name.begin(), logger_name.end(), logger_name.begin(),
124125
::toupper);
125126
const std::string env_var_name = "UR_LOG_" + logger_name;
126127
const auto default_flush_level = UR_LOGGER_LEVEL_ERROR;
127128
const std::string default_output = "stderr";
128129
auto flush_level = default_flush_level;
130+
ur_logger_level_t level = default_log_level;
129131
std::unique_ptr<logger::Sink> sink;
130132

131133
try {
132134
auto map = getenv_to_map(env_var_name.c_str());
133135
if (!map.has_value()) {
134-
return Logger(level,
136+
return Logger(default_log_level,
135137
std::make_unique<logger::StderrSink>(
136138
std::move(logger_name), skip_prefix, skip_linebreak));
137139
}
@@ -160,7 +162,7 @@ inline Logger create_logger(std::string logger_name, bool skip_prefix,
160162
if (!map->empty()) {
161163
std::cerr << "Wrong logger environment variable parameter: '"
162164
<< map->begin()->first << "'. Default logger options are set.";
163-
return Logger(level,
165+
return Logger(default_log_level,
164166
std::make_unique<logger::StderrSink>(
165167
std::move(logger_name), skip_prefix, skip_linebreak));
166168
}
@@ -173,7 +175,7 @@ inline Logger create_logger(std::string logger_name, bool skip_prefix,
173175
std::cerr << "Error when creating a logger instance from the '"
174176
<< env_var_name << "' environment variable:\n"
175177
<< e.what() << std::endl;
176-
return Logger(level,
178+
return Logger(default_log_level,
177179
std::make_unique<logger::StderrSink>(
178180
std::move(logger_name), skip_prefix, skip_linebreak));
179181
}

0 commit comments

Comments
 (0)