picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

service: consider a process exiting with SIGTERM a clean exit

This commit is contained in:
Lennart Poettering 2010-05-16 03:55:19 +02:00
parent ca139f94c8
commit cb8a8f78a1
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mount.c
View File

@ -900,7 +900,7 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
assert(m);
assert(pid >= 0);
success = code == CLD_EXITED && status == 0;
success = is_clean_exit(code, status);
m->failure = m->failure || !success;
assert(m->control_pid == pid);

2
service.c
View File

@ -1890,7 +1890,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
assert(s);
assert(pid >= 0);
success = code == CLD_EXITED && status == 0;
success = is_clean_exit(code, status);
s->failure = s->failure || !success;
if (s->main_pid == pid) {

2
socket.c
View File

@ -1204,7 +1204,7 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
assert(s);
assert(pid >= 0);
success = code == CLD_EXITED && status == 0;
success = is_clean_exit(code, status);
s->failure = s->failure || !success;
assert(s->control_pid == pid);

17
util.c
View File

@ -1910,6 +1910,23 @@ int make_stdio(int fd) {
return 0;
}
bool is_clean_exit(int code, int status) {
if (code == CLD_EXITED)
return status == 0;
/* If a daemon does not implement handlers for some of the
* signals that's not considered an unclean shutdown */
if (code == CLD_KILLED)
return
status == SIGHUP ||
status == SIGINT ||
status == SIGTERM ||
status == SIGPIPE;
return false;
}
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",

2
util.h
View File

@ -181,6 +181,8 @@ char *format_timestamp(char *buf, size_t l, usec_t t);
int make_stdio(int fd);
bool is_clean_exit(int code, int status);
#define DEFINE_STRING_TABLE_LOOKUP(name,type) \
const char *name##_to_string(type i) { \
if (i < 0 || i >= (type) ELEMENTSOF(name##_table)) \