emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supervise-daemon: save start time and respawn count

Browse Source 
This will allow rc-status to display an uptime and restart count for
supervised processes.
This commit is contained in:
William Hubbs 2017-05-11 13:52:22 -05:00
parent df027ca472
commit a3250e77d4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rc/supervise-daemon.c
View File

@ -171,7 +171,8 @@ static pid_t get_pid(const char *pidfile)
return pid; return pid;
} }
static void child_process(char *exec, char **argv) static void child_process(char *exec, char **argv, char *svcname,
int start_count)
{ {
RC_STRINGLIST *env_list; RC_STRINGLIST *env_list;
RC_STRING *env; RC_STRING *env;
@ -183,6 +184,9 @@ static void child_process(char *exec, char **argv)
char *np; char *np;
char **c; char **c;
char cmdline[PATH_MAX]; char cmdline[PATH_MAX];
time_t start_time;
char start_time_string[20];
char start_count_string[20];
#ifdef HAVE_PAM #ifdef HAVE_PAM
pam_handle_t *pamh = NULL; pam_handle_t *pamh = NULL;
@ -338,6 +342,13 @@ static void child_process(char *exec, char **argv)
c++; c++;
} }
syslog(LOG_INFO, "Running command line: %s", cmdline); syslog(LOG_INFO, "Running command line: %s", cmdline);
if (svcname) {
start_time = time(NULL);
strftime(start_time_string, 20, "%Y-%m-%d %H:%M:%S", localtime(&start_time));
rc_service_value_set(svcname, "start_time", start_time_string);
sprintf(start_count_string, "%i", start_count);
rc_service_value_set(svcname, "start_count", start_count_string);
}
execvp(exec, argv); execvp(exec, argv);
#ifdef HAVE_PAM #ifdef HAVE_PAM
@ -778,7 +789,7 @@ int main(int argc, char **argv)
if (child_pid == -1) if (child_pid == -1)
eerrorx("%s: fork: %s", applet, strerror(errno)); eerrorx("%s: fork: %s", applet, strerror(errno));
if (child_pid == 0) if (child_pid == 0)
child_process(exec, argv); child_process(exec, argv, svcname, respawn_count);
} }
} }
@ -792,5 +803,5 @@ int main(int argc, char **argv)
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (child_pid == 0) } else if (child_pid == 0)
child_process(exec, argv); child_process(exec, argv, svcname, respawn_count);
} }