Browse Source

update: server exit process

dev
Dnomd343 2 years ago
parent
commit
c4449ead50
  1. 2
      include/utils/process.h
  2. 21
      src/utils/process.c

2
include/utils/process.h

@ -11,8 +11,6 @@ typedef struct {
char *cwd; // working directory char *cwd; // working directory
} process; } process;
//extern process **process_list;
void process_list_run(); void process_list_run();
void process_list_init(); void process_list_init();
void process_list_daemon(); void process_list_daemon();

21
src/utils/process.c

@ -86,8 +86,8 @@ void process_list_run() { // start process list
signal(SIGINT, get_exit_signal); // catch Ctrl + C (2) signal(SIGINT, get_exit_signal); // catch Ctrl + C (2)
signal(SIGTERM, get_exit_signal); // catch exit signal (15) signal(SIGTERM, get_exit_signal); // catch exit signal (15)
signal(SIGCHLD, get_sub_exit); // callback when child process die signal(SIGCHLD, get_sub_exit); // callback when child process die
for (process **p = process_list; *p != NULL; ++p) { for (process **proc = process_list; *proc != NULL; ++proc) {
process_exec(*p); process_exec(*proc);
usleep(100 * 1000); // delay 100ms usleep(100 * 1000); // delay 100ms
} }
log_info("Process start complete"); log_info("Process start complete");
@ -104,11 +104,17 @@ void server_exit(int exit_code) { // kill sub process and exit
pause(); pause();
} }
EXITING = TRUE; EXITING = TRUE;
log_info("ClearDNS start exit process");
log_info("ClearDNS exiting"); for (process **proc = process_list; *proc != NULL; ++proc) { // send SIGTERM to all subprocess
log_info("%s send kill signal -> PID = %d", (*proc)->name, (*proc)->pid);
// TODO: kill subprocess and exit cleardns kill((*proc)->pid, SIGTERM);
}
for (process **proc = process_list; *proc != NULL; ++proc) { // ensure all subprocess exited
int status;
int ret = waitpid((*proc)->pid, &status, 0); // blocking wait
log_info("%s exit -> PID = %d", (*proc)->name, ret);
}
log_info("All sub-process exited");
exit(exit_code); exit(exit_code);
} }
@ -121,4 +127,5 @@ void get_sub_exit() { // catch child process exit
log_debug("Get SIGCHLD signal"); log_debug("Get SIGCHLD signal");
// TODO: check exit subprocess and restart it // TODO: check exit subprocess and restart it
} }

Loading…
Cancel
Save