From f47ad59316ddbfce0b24edac752222d300ed0da4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 1 Nov 2014 14:33:01 -0400 Subject: [PATCH] Use log "level" instead of "priority" The term "priority" is misleading because higher levels have lower priority. "Level" is clearer and shorter. This commit touches only the textual descriptions, not function and variable names themselves. "Priority" is used in various command-line switches and protocol constants, so completly getting rid of "priority" is hard. I also left "priority" in various places where the clarity suffered when it was removed. --- NEWS | 4 ++-- TODO | 2 -- man/daemon.xml | 6 +++--- man/sd_journal_stream_fd.xml | 2 +- man/systemd-udevd.service.xml | 4 ++-- man/udev.conf.xml | 2 +- src/libudev/libudev.c | 22 ++++++++++------------ 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index 82a1948a3..d5d4697d7 100644 --- a/NEWS +++ b/NEWS @@ -1971,8 +1971,8 @@ CHANGES WITH 207: certain paths from operation. * journald will now automatically flush all messages to disk - as soon as a message of the log priorities CRIT, ALERT or - EMERG is received. + as soon as a message at the log level CRIT, ALERT or EMERG + is received. Contributions from: Andrew Cook, Brandon Philips, Christian Hesse, Christoph Junghans, Colin Walters, Daniel Schaal, diff --git a/TODO b/TODO index af26a5c8b..92d08de23 100644 --- a/TODO +++ b/TODO @@ -364,8 +364,6 @@ Features: * think about window-manager-run-as-user-service problem: exit 0 → activate shutdown.target; exit != 0 → restart service -* use "log level" rather than "log priority" everywhere - * merge unit_kill_common() and unit_kill_context() * introduce ExecCondition= in services diff --git a/man/daemon.xml b/man/daemon.xml index 99c75a7a1..5d3a9903d 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -328,14 +328,14 @@ to simply log to standard error via fprintf(), which is then forwarded to syslog by the - init system. If log priorities are + init system. If log levels are necessary, these can be encoded by prefixing individual log lines with strings like <4> (for log - priority 4 "WARNING" in the syslog + level 4 "WARNING" in the syslog priority scheme), following a similar style as the Linux kernel's - printk() priority + printk() level system. For details, see sd-daemon3 and diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml index c9ce7cdb2..045b3fb21 100644 --- a/man/sd_journal_stream_fd.xml +++ b/man/sd_journal_stream_fd.xml @@ -90,7 +90,7 @@ syslog.h, see syslog3 for details. The third argument is a boolean: if true - kernel-style log priority level prefixes (such as + kernel-style log level prefixes (such as SD_WARNING) are interpreted, see sd-daemon3 for more information. diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index ab5c1636b..05a178c53 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -134,7 +134,7 @@ $UDEV_LOG= - Set the logging priority. + Set the log level. @@ -148,7 +148,7 @@ udev.log-priority= rd.udev.log-priority= - Set the logging priority. + Set the log level. diff --git a/man/udev.conf.xml b/man/udev.conf.xml index 16ad41e80..988129f62 100644 --- a/man/udev.conf.xml +++ b/man/udev.conf.xml @@ -69,7 +69,7 @@ udev_log - The logging priority. Valid values are the numerical + The log level. Valid values are the numerical syslog priorities or their textual representations: , and . diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index 846442765..f4f285c6e 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -79,7 +79,7 @@ static void log_stderr(struct udev *udev, * @udev: udev library context * * Retrieve stored data pointer from library context. This might be useful - * to access from callbacks like a custom logging function. + * to access from callbacks like a custom log function. * * Returns: stored userdata **/ @@ -197,7 +197,7 @@ _public_ struct udev *udev_new(void) prio = util_log_priority(val); if (prio < 0) - udev_err(udev, "/etc/udev/udev.conf:%u: invalid logging level '%s', ignoring.\n", line_nr, val); + udev_err(udev, "/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.\n", line_nr, val); else udev_set_log_priority(udev, prio); continue; @@ -212,7 +212,7 @@ _public_ struct udev *udev_new(void) prio = util_log_priority(env); if (prio < 0) - udev_err(udev, "$UDEV_LOG specifies invalid logging level '%s', ignoring.\n", env); + udev_err(udev, "$UDEV_LOG specifies invalid log level '%s', ignoring.\n", env); else udev_set_log_priority(udev, prio); } @@ -260,11 +260,11 @@ _public_ struct udev *udev_unref(struct udev *udev) /** * udev_set_log_fn: * @udev: udev library context - * @log_fn: function to be called for logging messages + * @log_fn: function to be called for log messages * * The built-in logging writes to stderr. It can be * overridden by a custom function, to plug log messages - * into the users' logging functionality. + * into the users' log functionality. * **/ _public_ void udev_set_log_fn(struct udev *udev, @@ -273,17 +273,16 @@ _public_ void udev_set_log_fn(struct udev *udev, const char *format, va_list args)) { udev->log_fn = log_fn; - udev_dbg(udev, "custom logging function %p registered\n", log_fn); + udev_dbg(udev, "custom log function %p registered\n", log_fn); } /** * udev_get_log_priority: * @udev: udev library context * - * The initial logging priority is read from the udev config file - * at startup. + * The initial log level is read from the udev config file at startup. * - * Returns: the current logging priority + * Returns: the current log level **/ _public_ int udev_get_log_priority(struct udev *udev) { @@ -293,10 +292,9 @@ _public_ int udev_get_log_priority(struct udev *udev) /** * udev_set_log_priority: * @udev: udev library context - * @priority: the new logging priority + * @priority: the new log priority * - * Set the current logging priority. The value controls which messages - * are logged. + * Set the log level. This value controls which messages are logged. **/ _public_ void udev_set_log_priority(struct udev *udev, int priority) { -- 2.30.2