diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-12-09 05:53:18 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-12-12 18:00:24 +0000 |
| commit | 84ea2e037490a9ad6c0a192cf237f88fd83cdd88 (patch) | |
| tree | 2d4ff0d57112780b40bce92cf9c6a134d9c8138c | |
| parent | 32e5641dbbfd91b650a9ec8cf62d28fd22109e9e (diff) | |
logging vty: describe 'logging set-log-mask' command, add OSMO_STRINGIFY_VAL()
Change-Id: I73ac5873ede858da44e1486d8a5c81da1ed5b19f
| -rw-r--r-- | include/osmocom/core/utils.h | 2 | ||||
| -rw-r--r-- | src/vty/logging_vty.c | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 0a3805df..5c660cd8 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -19,6 +19,8 @@ * Note: if nested within another preprocessor macro, this will * stringify the value of x instead of its name. */ #define OSMO_STRINGIFY(x) #x +/*! Stringify the value of a macro x, e.g. a port number. */ +#define OSMO_STRINGIFY_VAL(x) OSMO_STRINGIFY(x) /*! Make a value_string entry from an enum value name */ #define OSMO_VALUE_STRING(x) { x, #x } /*! Number of bytes necessary to store given BITS */ diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 215394f0..c39017b9 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -247,7 +247,15 @@ DEFUN(logging_set_category_mask, "logging set-log-mask MASK", LOGGING_STR "Set the logmask of this logging target\n" - "The logmask to use\n") + "List of logging categories to log, e.g. 'abc:mno:xyz'. Available log categories depend on the specific" + " application, refer to the 'logging level' command. Optionally add individual log levels like" + " 'abc,1:mno,3:xyz,5', where the level numbers are" + " " OSMO_STRINGIFY(LOGL_DEBUG) "=" OSMO_STRINGIFY_VAL(LOGL_DEBUG) + " " OSMO_STRINGIFY(LOGL_INFO) "=" OSMO_STRINGIFY_VAL(LOGL_INFO) + " " OSMO_STRINGIFY(LOGL_NOTICE) "=" OSMO_STRINGIFY_VAL(LOGL_NOTICE) + " " OSMO_STRINGIFY(LOGL_ERROR) "=" OSMO_STRINGIFY_VAL(LOGL_ERROR) + " " OSMO_STRINGIFY(LOGL_FATAL) "=" OSMO_STRINGIFY_VAL(LOGL_FATAL) + "\n") { struct log_target *tgt = osmo_log_vty2tgt(vty); @@ -263,7 +271,8 @@ ALIAS_DEPRECATED(logging_set_category_mask, "logging set log mask MASK", LOGGING_STR "Decide which categories to output.\n" - "Log commands\n" "Mask commands\n" "The logmask to use\n"); + "Log commands\n" "Mask commands\n" + "'set log mask' is deprecated, please refer to the docs of 'set-log-mask' instead\n"); DEFUN(diable_logging, |