Skip to content

Commit 953eac1

Browse files
rbxrbx
committed
Add 'detail' severity between debug and info
1 parent 9a6644c commit 953eac1

File tree

7 files changed

+45
-37
lines changed

7 files changed

+45
-37
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ where severity level is one of the following:
9393
"debug2",
9494
"debug1",
9595
"debug",
96+
"detail",
9697
"info",
9798
"state",
9899
"warn",

‎logger/Logger.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const unordered_map<string, Severity> Logger::fSeverityMap =
7878
{ "STATE", Severity::state },
7979
{ "info", Severity::info },
8080
{ "INFO", Severity::info },
81+
{ "detail", Severity::detail },
8182
{ "debug", Severity::debug },
8283
{ "DEBUG", Severity::debug },
8384
{ "debug1", Severity::debug1 },
@@ -92,7 +93,7 @@ const unordered_map<string, Severity> Logger::fSeverityMap =
9293
{ "TRACE", Severity::trace }
9394
};
9495

95-
const array<string, 14> Logger::fSeverityNames =
96+
const array<string, 15> Logger::fSeverityNames =
9697
{
9798
{
9899
"NOLOG",
@@ -102,6 +103,7 @@ const array<string, 14> Logger::fSeverityNames =
102103
"DEBUG2",
103104
"DEBUG1",
104105
"DEBUG",
106+
"DETAIL",
105107
"INFO",
106108
"STATE",
107109
"WARN",
@@ -291,6 +293,7 @@ string Logger::GetColoredSeverityString(Severity severity)
291293
case Severity::warn: return "\033[01;33mWARN\033[0m"; break;
292294
case Severity::state: return "\033[01;35mSTATE\033[0m"; break;
293295
case Severity::info: return "\033[01;32mINFO\033[0m"; break;
296+
case Severity::detail: return "\033[01;32mDETAIL\033[0m"; break;
294297
case Severity::debug: return "\033[01;34mDEBUG\033[0m"; break;
295298
case Severity::debug1: return "\033[01;34mDEBUG1\033[0m"; break;
296299
case Severity::debug2: return "\033[01;34mDEBUG2\033[0m"; break;

‎logger/Logger.h‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,30 @@ enum class Severity : int
5959
debug2 = 4,
6060
debug1 = 5,
6161
debug = 6,
62-
info = 7,
63-
state = 8,
64-
warn = 9,
65-
important = 10,
66-
alarm = 11,
67-
error = 12,
68-
fatal = 13,
62+
detail = 7,
63+
info = 8,
64+
state = 9,
65+
warn = 10,
66+
important = 11,
67+
alarm = 12,
68+
error = 13,
69+
fatal = 14,
6970
// aliases
7071
warning = warn,
7172
// backwards-compatibility
72-
NOLOG __attribute__((deprecated("Use LOG(nolog) instead (lowercase severity name)."))) = nolog,
73-
FATAL __attribute__((deprecated("Use LOG(fatal) instead (lowercase severity name)."))) = fatal,
74-
ERROR __attribute__((deprecated("Use LOG(error) instead (lowercase severity name)."))) = error,
75-
WARN __attribute__((deprecated("Use LOG(warn) instead (lowercase severity name)."))) = warn,
73+
NOLOG __attribute__((deprecated("Use LOG(nolog) instead (lowercase severity name)."))) = nolog,
74+
FATAL __attribute__((deprecated("Use LOG(fatal) instead (lowercase severity name)."))) = fatal,
75+
ERROR __attribute__((deprecated("Use LOG(error) instead (lowercase severity name)."))) = error,
76+
WARN __attribute__((deprecated("Use LOG(warn) instead (lowercase severity name)."))) = warn,
7677
WARNING __attribute__((deprecated("Use LOG(warning) instead (lowercase severity name)."))) = warn,
77-
STATE __attribute__((deprecated("Use LOG(state) instead (lowercase severity name)."))) = state,
78-
INFO __attribute__((deprecated("Use LOG(info) instead (lowercase severity name)."))) = info,
79-
DEBUG __attribute__((deprecated("Use LOG(debug) instead (lowercase severity name)."))) = debug,
80-
DEBUG1 __attribute__((deprecated("Use LOG(debug1) instead (lowercase severity name)."))) = debug1,
81-
DEBUG2 __attribute__((deprecated("Use LOG(debug2) instead (lowercase severity name)."))) = debug2,
82-
DEBUG3 __attribute__((deprecated("Use LOG(debug3) instead (lowercase severity name)."))) = debug3,
83-
DEBUG4 __attribute__((deprecated("Use LOG(debug4) instead (lowercase severity name)."))) = debug4,
84-
TRACE __attribute__((deprecated("Use LOG(trace) instead (lowercase severity name)."))) = trace
78+
STATE __attribute__((deprecated("Use LOG(state) instead (lowercase severity name)."))) = state,
79+
INFO __attribute__((deprecated("Use LOG(info) instead (lowercase severity name)."))) = info,
80+
DEBUG __attribute__((deprecated("Use LOG(debug) instead (lowercase severity name)."))) = debug,
81+
DEBUG1 __attribute__((deprecated("Use LOG(debug1) instead (lowercase severity name)."))) = debug1,
82+
DEBUG2 __attribute__((deprecated("Use LOG(debug2) instead (lowercase severity name)."))) = debug2,
83+
DEBUG3 __attribute__((deprecated("Use LOG(debug3) instead (lowercase severity name)."))) = debug3,
84+
DEBUG4 __attribute__((deprecated("Use LOG(debug4) instead (lowercase severity name)."))) = debug4,
85+
TRACE __attribute__((deprecated("Use LOG(trace) instead (lowercase severity name)."))) = trace
8586
};
8687

8788
// verbosity levels:
@@ -323,7 +324,7 @@ class Logger
323324

324325
static const std::unordered_map<std::string, Verbosity> fVerbosityMap;
325326
static const std::unordered_map<std::string, Severity> fSeverityMap;
326-
static const std::array<std::string, 14> fSeverityNames;
327+
static const std::array<std::string, 15> fSeverityNames;
327328
static const std::array<std::string, 9> fVerbosityNames;
328329

329330
// protection for use after static destruction took place

‎test/cycle.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -38,7 +38,7 @@ int main()
3838
Logger::SetConsoleSeverity(Severity::fatal);
3939
cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;
4040

41-
array<Severity, 14> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::info, Severity::state, Severity::warn, Severity::important, Severity::alarm, Severity::error, Severity::fatal }};
41+
array<Severity, 15> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::detail, Severity::info, Severity::state, Severity::warn, Severity::important, Severity::alarm, Severity::error, Severity::fatal }};
4242
#ifdef FAIR_MIN_SEVERITY
4343
for (unsigned int i = static_cast<int>(Severity::FAIR_MIN_SEVERITY); i < severitiesUp.size(); ++i) {
4444
#else
@@ -57,7 +57,7 @@ int main()
5757
Logger::SetConsoleSeverity(Severity::fatal);
5858
cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;
5959

60-
array<Severity, 14> severitiesDown{{ Severity::error, Severity::alarm, Severity::important, Severity::warn, Severity::state, Severity::info, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
60+
array<Severity, 15> severitiesDown{{ Severity::error, Severity::alarm, Severity::important, Severity::warn, Severity::state, Severity::info, Severity::detail, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
6161
#ifdef FAIR_MIN_SEVERITY
6262
for (unsigned int i = 0; i < severitiesDown.size() - static_cast<int>(Severity::FAIR_MIN_SEVERITY) - 1; ++i) {
6363
#else

‎test/logger.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ void printEverySeverity()
2424
LOG(debug2) << "debug2 message, counter: " << i++;
2525
LOG(debug1) << "debug1 message, counter: " << i++;
2626
LOG(debug) << "debug message, counter: " << i++;
27+
LOG(detail) << "detail message, counter: " << i++;
2728
LOG(info) << "info message, counter: " << i++;
2829
LOG(state) << "state message, counter: " << i++;
2930
LOG(warn) << "warning message, counter: " << i++;

‎test/nolog.cxx‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,20 @@ using namespace fair;
1313

1414
void printEverySeverity()
1515
{
16-
LOG(nolog) << "nolog message, counter: ";
17-
LOG(trace) << "trace message, counter: ";
18-
LOG(debug4) << "debug4 message, counter: ";
19-
LOG(debug3) << "debug3 message, counter: ";
20-
LOG(debug2) << "debug2 message, counter: ";
21-
LOG(debug1) << "debug1 message, counter: ";
22-
LOG(debug) << "debug message, counter: ";
23-
LOG(info) << "info message, counter: ";
24-
LOG(state) << "state message, counter: ";
25-
LOG(warn) << "warning message, counter: ";
26-
LOG(important) << "important message, counter: ";
27-
LOG(alarm) << "alarm message, counter: ";
28-
LOG(error) << "error message, counter: ";
16+
LOG(nolog) << "nolog message ";
17+
LOG(trace) << "trace message ";
18+
LOG(debug4) << "debug4 message ";
19+
LOG(debug3) << "debug3 message ";
20+
LOG(debug2) << "debug2 message ";
21+
LOG(debug1) << "debug1 message ";
22+
LOG(debug) << "debug message ";
23+
LOG(detail) << "detail message ";
24+
LOG(info) << "info message ";
25+
LOG(state) << "state message ";
26+
LOG(warn) << "warning message ";
27+
LOG(important) << "important message ";
28+
LOG(alarm) << "alarm message ";
29+
LOG(error) << "error message ";
2930
}
3031

3132
void silentlyPrintAllVerbositiesWithSeverity(Severity sev)

‎test/severity.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ uint32_t printEverySeverity(uint32_t i)
2727
LOG(debug2) << "debug2 message, counter: " << i++;
2828
LOG(debug1) << "debug1 message, counter: " << i++;
2929
LOG(debug) << "debug message, counter: " << i++;
30+
LOG(detail) << "detail message, counter: " << i++;
3031
LOG(info) << "info message, counter: " << i++;
3132
LOG(state) << "state message, counter: " << i++;
3233
LOG(warn) << "warning message, counter: " << i++;

0 commit comments

Comments
 (0)