Skip to content

Commit 770989d

Browse files
committed
Update for review comments
-Remove verbage and boolean for optional stderr mirroring -Replace fd 2 w/define Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent 072cdb2 commit 770989d

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

source/loader/ze_loader.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ namespace loader
2525
context_t *context;
2626

2727
void context_t::debug_trace_message(std::string message, std::string result) {
28-
if (zel_logger->log_to_console){
29-
std::string debugTracePrefix = "ZE_LOADER_DEBUG_TRACE:";
30-
std::cerr << debugTracePrefix << message << result << std::endl;
31-
}
32-
3328
zel_logger->log_trace(message + result);
3429
};
3530

@@ -637,7 +632,6 @@ namespace loader
637632

638633
if ((getenv_string("ZEL_LOADER_LOGGING_LEVEL") == "trace") && !debugTraceEnabled) {
639634
debugTraceEnabled = true;
640-
zel_logger->log_to_console = false;
641635
}
642636

643637
if (zel_logger->getLevel() != loader::LogLevel::off) {

source/utils/ze_logger.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ static bool winEnableAnsiColor(int fd) {
3535
if (!_isatty(fd)) {
3636
return false;
3737
}
38-
HANDLE h = (fd == 2) ? GetStdHandle(STD_ERROR_HANDLE)
39-
: GetStdHandle(STD_OUTPUT_HANDLE);
38+
HANDLE h = (fd == STDERR_FD) ? GetStdHandle(STD_ERROR_HANDLE)
39+
: GetStdHandle(STD_OUTPUT_HANDLE);
4040
if (h == INVALID_HANDLE_VALUE) {
4141
return false;
4242
}

source/utils/ze_logger.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ class ZeLogger {
7676
void log_fatal(const std::string &msg) { critical(msg); }
7777
void log_performance(const std::string &msg) { warn("[performance] " + msg); }
7878

79-
// When true, callers may mirror certain messages to stdout/stderr.
80-
// Defaulted to true so init code can read it before explicitly disabling.
81-
bool log_to_console = true;
82-
8379
private:
8480
void write(LogLevel msg_level, const std::string &msg);
8581
void formatLine(LogLevel msg_level, const std::string &msg, std::string &out);

0 commit comments

Comments
 (0)