From 457d8b69d5365eb20d39391e2590304a923e9bd5 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Thu, 16 Oct 2014 19:13:45 -0500

Subject: [PATCH] systemd: log deserialization errors as warnings

If we failed to parse something that we wrote ourselves,

things are seriously off. This is also likely to lead to

problems futher on.

---

 src/core/manager.c | 16 ++++++++--------

 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/manager.c b/src/core/manager.c

index e0c1cd187e..1bf75e20b0 100644

--- a/src/core/manager.c

+++ b/src/core/manager.c

@@ -354,7 +354,7 @@ static int manager_setup_signals(Manager *m) {

                 return r;

         /* Process signals a bit earlier than the rest of things, but

-         * later that notify_fd processing, so that the notify

+         * later than notify_fd processing, so that the notify

          * processing can still figure out to which process/service a

          * message belongs, before we reap the process. */

         r = sd_event_source_set_priority(m->signal_event_source, -5);

@@ -2229,7 +2229,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         uint32_t id;

                         if (safe_atou32(l+15, &id) < 0)

-                                log_debug("Failed to parse current job id value %s", l+15);

+                                log_warning("Failed to parse current job id value %s", l+15);

                         else

                                 m->current_job_id = MAX(m->current_job_id, id);

@@ -2237,7 +2237,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         uint32_t n;

                         if (safe_atou32(l+17, &n) < 0)

-                                log_debug("Failed to parse installed jobs counter %s", l+17);

+                                log_warning("Failed to parse installed jobs counter %s", l+17);

                         else

                                 m->n_installed_jobs += n;

@@ -2245,7 +2245,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         uint32_t n;

                         if (safe_atou32(l+14, &n) < 0)

-                                log_debug("Failed to parse failed jobs counter %s", l+14);

+                                log_warning("Failed to parse failed jobs counter %s", l+14);

                         else

                                 m->n_failed_jobs += n;

@@ -2254,7 +2254,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         b = parse_boolean(l+10);

                         if (b < 0)

-                                log_debug("Failed to parse taint /usr flag %s", l+10);

+                                log_warning("Failed to parse taint /usr flag %s", l+10);

                         else

                                 m->taint_usr = m->taint_usr || b;

@@ -2305,7 +2305,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         int fd;

                         if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))

-                                log_debug("Failed to parse notify fd: %s", l + 10);

+                                log_warning("Failed to parse notify fd: %s", l + 10);

                         else {

                                 m->notify_event_source = sd_event_source_unref(m->notify_event_source);

                                 safe_close(m->notify_fd);

@@ -2328,14 +2328,14 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {

                         int fd;

                         if (safe_atoi(l + 9, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))

-                                log_debug("Failed to parse kdbus fd: %s", l + 9);

+                                log_warning("Failed to parse kdbus fd: %s", l + 9);

                         else {

                                 safe_close(m->kdbus_fd);

                                 m->kdbus_fd = fdset_remove(fds, fd);

                         }

                 } else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) == 0)

-                        log_debug("Unknown serialization item '%s'", l);

+                        log_warning("Unknown serialization item '%s'", l);

         }

         for (;;) {