Georg
/
catsit
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Make log messages consistent

This commit is contained in:
C. McEnroe 2020-08-15 15:57:45 -04:00
parent e25813c0b2
commit 3a57df720e
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
service.c
View File

@ -114,31 +114,25 @@ err:
void serviceStatus(struct Service *service) { void serviceStatus(struct Service *service) {
if (service->state == Stop && service->intent == Stop) { if (service->state == Stop && service->intent == Stop) {
syslog(LOG_INFO, "%s is stopped", service->name); syslog(LOG_INFO, "%s[] is stopped", service->name);
} else if (service->state == Stop && service->intent == Start) { } else if (service->state == Stop && service->intent == Start) {
struct timespec now, timeleft; struct timespec now, timeleft;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
timespecsub(&service->restartDeadline, &now, &timeleft); timespecsub(&service->restartDeadline, &now, &timeleft);
syslog( syslog(
LOG_INFO, "%s is restarting in %jds", LOG_INFO, "%s[] is restarting in %lds",
service->name, (intmax_t)timeleft.tv_sec service->name, (long)timeleft.tv_sec
); );
} else if (service->state == Stop && service->intent == Restart) { } else if (service->state == Stop && service->intent == Restart) {
syslog(LOG_INFO, "%s is restarting", service->name); syslog(LOG_INFO, "%s[] is restarting", service->name);
} else if (service->state == Start && service->intent == Start) { } else if (service->state == Start && service->intent == Start) {
syslog( syslog(LOG_INFO, "%s[%d] is started", service->name, service->pid);
LOG_INFO, "%s[%jd] is started",
service->name, (intmax_t)service->pid
);
} else if (service->state == Start && service->intent == Stop) { } else if (service->state == Start && service->intent == Stop) {
syslog( syslog(LOG_INFO, "%s[%d] is stopping", service->name, service->pid);
LOG_INFO, "%s[%jd] is stopping",
service->name, (intmax_t)service->pid
);
} else if (service->state == Start && service->intent == Restart) { } else if (service->state == Start && service->intent == Restart) {
syslog( syslog(
LOG_INFO, "%s[%jd] is stopping for restart", LOG_INFO, "%s[%d] is stopping for restart",
service->name, (intmax_t)service->pid service->name, service->pid
); );
} }
} }
@ -169,10 +163,7 @@ void serviceStart(struct Service *service) {
return; return;
} }
if (service->pid) { if (service->pid) {
syslog( syslog(LOG_INFO, "%s[%d] started", service->name, service->pid);
LOG_INFO, "%s[%jd] start",
service->name, (intmax_t)service->pid
);
service->state = Start; service->state = Start;
return; return;
} }
@ -213,8 +204,8 @@ void serviceSignal(struct Service *service, int signal) {
int error = kill(service->pid, signal); int error = kill(service->pid, signal);
if (error) { if (error) {
syslog( syslog(
LOG_ERR, "kill(%s[%jd], %s): %m", LOG_ERR, "kill(%s[%d], %s): %m",
service->name, (intmax_t)service->pid, sys_signame[signal] service->name, service->pid, sys_signame[signal]
); );
} }
} }
@ -234,10 +225,7 @@ void serviceRestart(struct Service *service) {
} }
static void serviceLog(struct Service *service, int pri, const char *log) { static void serviceLog(struct Service *service, int pri, const char *log) {
syslog( syslog(pri, "%s[%d]: %s", service->name, service->pid, log);
pri, "%s[%ju]: %s",
service->name, (intmax_t)service->pid, log
);
} }
void serviceRead(struct Service *service) { void serviceRead(struct Service *service) {
@ -269,7 +257,7 @@ void serviceReap(pid_t pid, int status) {
break; break;
} }
if (!service) { if (!service) {
syslog(LOG_WARNING, "reaping unknown child %jd", (intmax_t)pid); syslog(LOG_WARNING, "reaping unknown child %d", pid);
return; return;
} }
serviceFlush(service); serviceFlush(service);
@ -282,26 +270,26 @@ void serviceReap(pid_t pid, int status) {
} }
if (exit) { if (exit) {
syslog( syslog(
LOG_WARNING, "%s[%jd] exit %d", LOG_WARNING, "%s[%d] exited %d",
service->name, (intmax_t)pid, exit service->name, pid, exit
); );
} }
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
syslog( syslog(
LOG_WARNING, "%s[%jd] signal %s", LOG_WARNING, "%s[%d] signaled %s",
service->name, (intmax_t)pid, sys_signame[WTERMSIG(status)] service->name, pid, sys_signame[WTERMSIG(status)]
); );
} }
if (service->intent == Start) { if (service->intent == Start) {
// TODO: Determine if restart interval should be reset?
setDeadline(service); setDeadline(service);
syslog( syslog(
LOG_INFO, "%s[%jd] restart in %jds", LOG_INFO, "%s[%d] restarting in %lds",
service->name, (intmax_t)pid, service->name, pid, (long)service->restartInterval.tv_sec
(intmax_t)service->restartInterval.tv_sec
); );
} else { } else {
syslog(LOG_INFO, "%s[%jd] stop", service->name, (intmax_t)pid); syslog(LOG_INFO, "%s[%d] stopped", service->name, pid);
} }
if (service->intent == Restart) { if (service->intent == Restart) {
serviceStart(service); serviceStart(service);