Skip to content

DAOS-17989 : engin uses DEBUG instead of DBUG #17653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
grom72 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −9
Draft

DAOS-17989 : engin uses DEBUG instead of DBUG #17653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cart/README.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This file lists the environment variables used in CaRT.

. D_LOG_FLUSH
Specifies priority level for flushing of messages into the log file.
Can be set to one of the following "DBUG,INFO,NOTE,WARN,ERR,CRIT,ALRT,EMRG,EMIT"
Can be set to one of the following "DEBUG,INFO,NOTE,WARN,ERR,CRIT,ALRT,EMRG,EMIT"
If not set will default to "WARN".

. DD_STDERR
Expand Down
11 changes: 5 additions & 6 deletions src/gurt/dlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -115,10 +115,10 @@ static const char *clog_pristr(int);
static int clog_setnfac(int);

/* static arrays for converting between pri's and strings */
static const char * const norm[] = { "DBUG", "INFO", "NOTE", "WARN", "ERR ",
"CRIT", "ALRT", "EMRG", "EMIT"};
static const char *const norm[] = {"DEBUG", "INFO ", "NOTE ", "WARN ", "ERR ",
"CRIT ", "ALRT ", "EMRG ", "EMIT "};
/**
* clog_pristr: convert priority to 4 byte symbolic name.
* clog_pristr: convert priority to 5 byte symbolic name.
*
* \param[in] pri the priority to convert to a string
*
Expand Down Expand Up @@ -775,8 +775,7 @@ static int d_log_str2pri(const char *pstr, size_t len)
if (strncasecmp(pstr, "ERR", len) == 0 || strncasecmp(pstr, "ERROR", len) == 0)
/* has trailing space in the array */
return DLOG_ERR;
if (((strncasecmp(pstr, "DEBUG", len) == 0) ||
(strncasecmp(pstr, "DBUG", len) == 0))) {
if (strncasecmp(pstr, "DEBUG", len) == 0) {
/* check to see is debug mask bits are set */
return d_dbglog_data.dd_mask != 0 ?
d_dbglog_data.dd_mask : DLOG_DBG;
Expand Down
4 changes: 2 additions & 2 deletions src/tests/ftest/cart/util/cart_logparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# /*
# * (C) Copyright 2016-2023 Intel Corporation.
# * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
# * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
# *
# * SPDX-License-Identifier: BSD-2-Clause-Patent
# */
Expand Down Expand Up @@ -34,7 +34,7 @@ class InvalidLogFile(Exception):
'WARN': 6,
'NOTE': 7,
'INFO': 8,
'DBUG': 9}
'DEBUG': 9}

# Make a reverse lookup from log level to name.
LOG_NAMES = {}
Expand Down
Loading