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

Add debug logging to start-stop-daemon and rc-supervisor

Browse Source 
This will make it easier to track down why the supervisor intermittently
hangs after it runs for a long time.
This commit is contained in:
William Hubbs 2018-12-18 11:29:10 -06:00
parent 5427783fdf
commit d5c396cbfc
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/rc/rc-schedules.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <syslog.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -270,8 +271,11 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
einfo("Would send signal %d to PID %d", sig, pi->pid); einfo("Would send signal %d to PID %d", sig, pi->pid);
nkilled++; nkilled++;
} else { } else {
if (sig) {
syslog(LOG_DEBUG, "Sending signal %d to PID %d", sig, pi->pid);
if (!quiet) if (!quiet)
ebeginv("Sending signal %d to PID %d", sig, pi->pid); ebeginv("Sending signal %d to PID %d", sig, pi->pid);
}
errno = 0; errno = 0;
killed = (kill(pi->pid, sig) == 0 || killed = (kill(pi->pid, sig) == 0 ||
errno == ESRCH ? true : false); errno == ESRCH ? true : false);
@ -279,6 +283,9 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
eendv(killed ? 0 : 1, eendv(killed ? 0 : 1,
"%s: failed to send signal %d to PID %d: %s", "%s: failed to send signal %d to PID %d: %s",
applet, sig, pi->pid, strerror(errno)); applet, sig, pi->pid, strerror(errno));
else if (!killed)
syslog(LOG_ERR, "Failed to send signal %d to PID %d: %s",
sig, pi->pid, strerror(errno));
if (!killed) { if (!killed) {
nkilled = -1; nkilled = -1;
} else { } else {
@ -310,12 +317,18 @@ int run_stop_schedule(const char *applet,
if (!(pid > 0 || exec || uid || (argv && *argv))) if (!(pid > 0 || exec || uid || (argv && *argv)))
return 0; return 0;
if (exec) if (exec) {
einfov("Will stop %s", exec); einfov("Will stop %s", exec);
if (pid > 0) syslog(LOG_DEBUG, "Will stop %s", exec);
}
if (pid > 0) {
einfov("Will stop PID %d", pid); einfov("Will stop PID %d", pid);
if (uid) syslog(LOG_DEBUG, "Will stop PID %d", pid);
}
if (uid) {
einfov("Will stop processes owned by UID %d", uid); einfov("Will stop processes owned by UID %d", uid);
syslog(LOG_DEBUG, "Will stop processes owned by UID %d", uid);
}
if (argv && *argv) { if (argv && *argv) {
einfovn("Will stop processes of `"); einfovn("Will stop processes of `");
if (rc_yesno(getenv("EINFO_VERBOSE"))) { if (rc_yesno(getenv("EINFO_VERBOSE"))) {