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.

diff --git a/NEWS b/NEWS
index 82a1948a38d519aa82ab875edf42c2c85fa19679..d5d4697d79bc27d1473748ddec3b8fbdfde9256d 100644 (file)
--- 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 af26a5c8b6057f60d2882489a3a83fc6f4e4ec17..92d08de23d8e21ab7c57d3eb7e444d7be081d2eb 100644 (file)
--- 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 99c75a7a18eb9b5d48452b012ef33100c9aae411..5d3a9903da310d007cfb82878f4adc06506c2699 100644 (file)
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -328,14 +328,14 @@
                                 to simply log to standard error via
                                 <function>fprintf()</function>, 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 <literal>&lt;4&gt;</literal> (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
-                                <function>printk()</function> priority
+                                <function>printk()</function> level
                                 system. For details, see
                                 <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                                 and

diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index c9ce7cdb227e0279f432e94ba850af3a7c139667..045b3fb21eb86e4fa47c37ab4c4121cb04c9b861 100644 (file)
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -90,7 +90,7 @@
                 <filename>syslog.h</filename>, see
                 <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 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
                 <constant>SD_WARNING</constant>) are interpreted, see
                 <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 for more information.</para>

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index ab5c1636b255a6bec6c68f8de1641ca3b14b6cda..05a178c53bd8d72ff63e1bb868f015cc015b7d35 100644 (file)
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -134,7 +134,7 @@
       <varlistentry>
         <term><varname>$UDEV_LOG=</varname></term>
         <listitem>
-          <para>Set the logging priority.</para>
+          <para>Set the log level.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -148,7 +148,7 @@
         <term><varname>udev.log-priority=</varname></term>
         <term><varname>rd.udev.log-priority=</varname></term>
         <listitem>
-          <para>Set the logging priority.</para>
+          <para>Set the log level.</para>
         </listitem>
       </varlistentry>
       <varlistentry>

diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 16ad41e80e42f4a2553252379bd94297d837e8b6..988129f62c6dc5e2545842466cb385811a4fb367 100644 (file)
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -69,7 +69,7 @@
         <term><varname>udev_log</varname></term>
 
         <listitem>
-          <para>The logging priority. Valid values are the numerical
+          <para>The log level. Valid values are the numerical
           syslog priorities or their textual representations:
           <option>err</option>, <option>info</option> and
           <option>debug</option>.</para>

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 846442765175186a6f1610e6df59ed298a6c9e4c..f4f285c6e0e6890f0cb137561f5ae248b5f4301a 100644 (file)
--- 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)
 {