summaryrefslogtreecommitdiff
path: root/src/journal-remote
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-27 19:48:02 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-27 22:05:23 +0100
commit086891e5c119abb9854237fc32e736fe2d67234c (patch)
tree4fc81d73413d1f1aa351e0de248307180c8893de /src/journal-remote
parentfb6d9b77a71a5f007392b754bf7d8e06a6bed69a (diff)
log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers
This change has two benefits: - The format string %m will now resolve to the specified error (or to errno if the specified error is 0. This allows getting rid of a ton of strerror() invocations, a function that is not thread-safe. - The specified error can be passed to the journal in the ERRNO= field. Now of course, we just need somebody to convert all cases of this: log_error("Something happened: %s", strerror(-r)); into thus: log_error_errno(-r, "Something happened: %m");
Diffstat (limited to 'src/journal-remote')
-rw-r--r--src/journal-remote/microhttpd-util.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 55c45f4693..bec4134620 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -41,7 +41,7 @@ void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
f = strappenda("microhttpd: ", fmt);
DISABLE_WARNING_FORMAT_NONLITERAL;
- log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
+ log_metav(LOG_INFO, 0, NULL, 0, NULL, f, ap);
REENABLE_WARNING;
}
@@ -126,11 +126,10 @@ void log_func_gnutls(int level, const char *message) {
if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) {
if (gnutls_log_map[level].enabled)
- log_meta(gnutls_log_map[level].level, NULL, 0, NULL,
- "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);
+ log_meta(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);
} else {
log_debug("Received GNUTLS message with unknown level %d.", level);
- log_meta(LOG_DEBUG, NULL, 0, NULL, "gnutls: %s", message);
+ log_meta(LOG_DEBUG, 0, NULL, 0, NULL, "gnutls: %s", message);
}
}