summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-12-02 00:19:05 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-02 13:23:03 +0100
commite5035a2778b7ed2a8ac901521ed47cf079359e68 (patch)
treed47879694a8993f82578d168e70f9b50f7be0823
parenta195cbad3796dfda3d1016e4819c612c859e3c7b (diff)
manager: log deserialization errors only at LOG_DEBUG level
During upgrades and when transitioning between different systemd versions in initrd and on the host we have to expect that some serialization fields are unknown or parse incorrectly. This shouldn't really be considered an error, hence downgrade the log messages about it to debug. This way we can still trace it, but it doesn't confuse users. This kinda reverts 46849c3f.
-rw-r--r--src/core/manager.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 5fbb375cd4..cff24fa68e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2289,7 +2289,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
uint32_t id;
if (safe_atou32(l+15, &id) < 0)
- log_warning("Failed to parse current job id value %s", l+15);
+ log_debug("Failed to parse current job id value %s", l+15);
else
m->current_job_id = MAX(m->current_job_id, id);
@@ -2297,7 +2297,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
uint32_t n;
if (safe_atou32(l+17, &n) < 0)
- log_warning("Failed to parse installed jobs counter %s", l+17);
+ log_debug("Failed to parse installed jobs counter %s", l+17);
else
m->n_installed_jobs += n;
@@ -2305,7 +2305,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
uint32_t n;
if (safe_atou32(l+14, &n) < 0)
- log_warning("Failed to parse failed jobs counter %s", l+14);
+ log_debug("Failed to parse failed jobs counter %s", l+14);
else
m->n_failed_jobs += n;
@@ -2314,7 +2314,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
b = parse_boolean(l+10);
if (b < 0)
- log_warning("Failed to parse taint /usr flag %s", l+10);
+ log_debug("Failed to parse taint /usr flag %s", l+10);
else
m->taint_usr = m->taint_usr || b;
@@ -2365,7 +2365,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_warning("Failed to parse notify fd: %s", l + 10);
+ log_debug("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);
@@ -2388,7 +2388,7 @@ 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_warning("Failed to parse kdbus fd: %s", l + 9);
+ log_debug("Failed to parse kdbus fd: %s", l + 9);
else {
safe_close(m->kdbus_fd);
m->kdbus_fd = fdset_remove(fds, fd);