From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 29 Sep 2016 14:07:41 +0000 (+0200)
Subject: pid1: more informative error message for ignored notifications
X-Git-Tag: v232~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a86b76753d7868c2d05f046f601bc7dc89fc2203;p=thirdparty%2Fsystemd.git

pid1: more informative error message for ignored notifications

It's probably easier to diagnose a bad notification message if the
contents are printed. But still, do anything only if debugging is on.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 1ea6539ebc4..0f95bf49fb7 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1672,8 +1672,14 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const
 
         if (UNIT_VTABLE(u)->notify_message)
                 UNIT_VTABLE(u)->notify_message(u, pid, tags, fds);
-        else
-                log_unit_debug(u, "Got notification message for unit. Ignoring.");
+        else if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+                _cleanup_free_ char *x = NULL, *y = NULL;
+
+                x = cescape(buf);
+                if (x)
+                        y = ellipsize(x, 20, 90);
+                log_unit_debug(u, "Got notification message \"%s\", ignoring.", strnull(y));
+        }
 }
 
 static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata) {