summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fixme2
-rw-r--r--src/log.h2
-rw-r--r--src/mount.c3
-rw-r--r--src/service.c8
-rw-r--r--src/socket.c3
5 files changed, 13 insertions, 5 deletions
diff --git a/fixme b/fixme
index 10573058bb..b80ea43a27 100644
--- a/fixme
+++ b/fixme
@@ -55,6 +55,8 @@
* fingerprint.target, wireless.target, gps.target
+* fix merging of device units
+
External:
* default.target must be %ghosted...
diff --git a/src/log.h b/src/log.h
index ed9b8c84d0..e5ea5310ca 100644
--- a/src/log.h
+++ b/src/log.h
@@ -83,6 +83,8 @@ int log_dump_internal(
const char *func,
char *buffer);
+#define log_full(level, ...) log_meta(level, __FILE__, __LINE__, __func__, __VA_ARGS__)
+
#define log_debug(...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_info(...) log_meta(LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_notice(...) log_meta(LOG_NOTICE, __FILE__, __LINE__, __func__, __VA_ARGS__)
diff --git a/src/mount.c b/src/mount.c
index 5b0bc6bdf0..bee3c9a60e 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -962,7 +962,8 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
}
- log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+ log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ "%s mount process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
/* Note that mount(8) returning and the kernel sending us a
* mount table change event might happen out-of-order. If an
diff --git a/src/service.c b/src/service.c
index 1bfab5013d..a5d1ebd84b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2199,7 +2199,8 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
success = true;
}
- log_debug("%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status);
+ log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ "%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status);
s->failure = s->failure || !success;
/* The service exited, so the service is officially
@@ -2256,7 +2257,8 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
s->control_pid = 0;
- log_debug("%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+ log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ "%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
s->failure = s->failure || !success;
/* If we are shutting things down anyway we
@@ -2476,7 +2478,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
s->state == SERVICE_RELOAD)) {
if (parse_pid(e + 8, &pid) < 0)
- log_warning("Failed to parse %s", e);
+ log_warning("Failed to parse notification message %s", e);
else {
log_debug("%s: got %s", u->meta.id, e);
service_set_main_pid(s, pid);
diff --git a/src/socket.c b/src/socket.c
index 257a4e959a..4cf21cf0b1 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1535,7 +1535,8 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
success = true;
}
- log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+ log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ "%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
s->failure = s->failure || !success;
if (s->control_command && s->control_command->command_next && success) {