Fixes #13372.
}
unit_log_process_exit(
- u, f == MOUNT_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+ u,
"Mount process",
mount_exec_command_to_string(m->control_command_id),
+ f == MOUNT_SUCCESS,
code, status);
/* Note that due to the io event priority logic, we can be sure the new mountinfo is loaded
f = SERVICE_SUCCESS;
}
- /* When this is a successful exit, let's log about the exit code on DEBUG level. If this is a failure
- * and the process exited on its own via exit(), then let's make this a NOTICE, under the assumption
- * that the service already logged the reason at a higher log level on its own. (Internally,
- * unit_log_process_exit() will possibly bump this to WARNING if the service died due to a signal.) */
unit_log_process_exit(
- u, f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+ u,
"Main process",
service_exec_command_to_string(SERVICE_EXEC_START),
+ f == SERVICE_SUCCESS,
code, status);
if (s->result == SERVICE_SUCCESS)
}
unit_log_process_exit(
- u, f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+ u,
"Control process",
service_exec_command_to_string(s->control_command_id),
+ f == SERVICE_SUCCESS,
code, status);
if (s->state != SERVICE_RELOAD && s->result == SERVICE_SUCCESS)
}
unit_log_process_exit(
- u, f == SOCKET_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+ u,
"Control process",
socket_exec_command_to_string(s->control_command_id),
+ f == SOCKET_SUCCESS,
code, status);
if (s->result == SOCKET_SUCCESS)
}
unit_log_process_exit(
- u, f == SWAP_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+ u,
"Swap process",
swap_exec_command_to_string(s->control_command_id),
+ f == SWAP_SUCCESS,
code, status);
switch (s->state) {
void unit_log_process_exit(
Unit *u,
- int level,
const char *kind,
const char *command,
+ bool success,
int code,
int status) {
+ int level;
+
assert(u);
assert(kind);
- if (code != CLD_EXITED)
+ /* If this is a successful exit, let's log about the exit code on DEBUG level. If this is a failure
+ * and the process exited on its own via exit(), then let's make this a NOTICE, under the assumption
+ * that the service already logged the reason at a higher log level on its own. Otherwise, make it a
+ * WARNING. */
+ if (success)
+ level = LOG_DEBUG;
+ else if (code == CLD_EXITED)
+ level = LOG_NOTICE;
+ else
level = LOG_WARNING;
log_struct(level,
unit_log_failure(u, result);
}
-void unit_log_process_exit(Unit *u, int level, const char *kind, const char *command, int code, int status);
+void unit_log_process_exit(Unit *u, const char *kind, const char *command, bool success, int code, int status);
int unit_exit_status(Unit *u);
int unit_success_action_exit_status(Unit *u);