diff --git a/src/cart/README.env b/src/cart/README.env index befc0fd8f4f..7b262885362 100644 --- a/src/cart/README.env +++ b/src/cart/README.env @@ -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 diff --git a/src/gurt/dlog.c b/src/gurt/dlog.c index 08bf2524b19..0219b36c1d5 100644 --- a/src/gurt/dlog.c +++ b/src/gurt/dlog.c @@ -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 */ @@ -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 * @@ -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; diff --git a/src/tests/ftest/cart/util/cart_logparse.py b/src/tests/ftest/cart/util/cart_logparse.py index 4f73a6f35cc..22c2f858648 100644 --- a/src/tests/ftest/cart/util/cart_logparse.py +++ b/src/tests/ftest/cart/util/cart_logparse.py @@ -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 # */ @@ -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 = {}