diff --git a/README.md b/README.md index 461c459..8ea0724 100644 --- a/README.md +++ b/README.md @@ -126,8 +126,8 @@ it is same for all sinks, and is one of the following values: `verylow`, `low`, verylow: message low: [severity] message medium: [HH:MM:SS][severity] message -high: [process name][HH:MM:SS][severity] message -veryhigh: [process name][HH:MM:SS:µS][severity][file:line:function] message +high: [process_name][HH:MM:SS][severity] message +veryhigh: [process_name][HH:MM:SS:µS][severity][file:line:function] message user1: [severity] message user2: [severity] message user3: [severity] message @@ -146,12 +146,12 @@ The `fair::Logger::VerbositySpec` object can e.g. be created like this: ```C++ auto spec = fair::VerbositySpec::Make(VerbositySpec::Info::timestamp_s, VerbositySpec::Info::process_name); -// results in [HH:MM:SS][process name] message +// results in [HH:MM:SS][process_name] message ``` | **Argument** | **Result** | | --- | --- | -| `fair::VerbositySpec::Info::process_name` | `[process name]` | +| `fair::VerbositySpec::Info::process_name` | `[process_name]` | | `fair::VerbositySpec::Info::timestamp_s` | `[HH:MM:SS]` | | `fair::VerbositySpec::Info::timestamp_us` | `[HH:MM:SS:µS]` | | `fair::VerbositySpec::Info::severity` | `[severity]` | diff --git a/logger/Logger.h b/logger/Logger.h index 7f0b1b6..5c8fee5 100644 --- a/logger/Logger.h +++ b/logger/Logger.h @@ -41,7 +41,7 @@ #include #include #include // time_t -#include +#include // is_same #include #include // pair @@ -83,26 +83,26 @@ enum class Severity : int // verylow: message // low: [severity] message // medium: [HH:MM:SS][severity] message -// high: [process name][HH:MM:SS][severity] message -// veryhigh: [process name][HH:MM:SS:µS][severity][file:line:function] message +// high: [process_name][HH:MM:SS][severity] message +// veryhigh: [process_name][HH:MM:SS:µS][severity][file:line:function] message enum class Verbosity : int { - verylow, + verylow = 0, low, medium, high, veryhigh, - // backwards-compatibility: - VERYLOW = verylow, - LOW = low, - MEDIUM = medium, - HIGH = high, - VERYHIGH = veryhigh, // extra slots for user-defined verbosities: user1, user2, user3, user4, + // backwards-compatibility: + VERYLOW = verylow, + LOW = low, + MEDIUM = medium, + HIGH = high, + VERYHIGH = veryhigh }; struct VerbositySpec @@ -110,7 +110,7 @@ struct VerbositySpec enum class Info : int { __empty__ = 0, // used to initialize order array - process_name, // [process name] + process_name, // [process_name] timestamp_s, // [HH:MM:SS] timestamp_us, // [HH:MM:SS:µS] severity, // [severity]