rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wait for logger after fatal() 

With -f, when the main process exits after a fatal() (usually) the
shell prompt is printed before the logger message.

This adds a small poll to wait for the logger process to exit.
This commit is contained in:
Omar Polo 2021-04-28 12:43:17 +00:00
parent 48b69cb2dc
commit 2ef7f631db
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
log.c
View File

@ -23,6 +23,7 @@
#include <event.h>
#include <imsg.h>
#include <netdb.h>
#include <poll.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@ -82,14 +83,20 @@ send_log(int priority, const char *msg, size_t len)
void
fatal(const char *fmt, ...)
{
struct pollfd pfd;
va_list ap;
int r;
char *fmted;
va_start(ap, fmt);
if ((r = vasprintf(&fmted, fmt, ap)) != -1) {
send_log(LOG_ERR, fmted, r+1);
send_log(LOG_CRIT, fmted, r+1);
free(fmted);
/* wait for the logger process to shut down */
pfd.fd = logibuf.fd;
pfd.events = POLLIN;
poll(&pfd, 1, 1000);
}
va_end(ap);
exit(1);
@ -256,16 +263,28 @@ handle_imsg_quit(struct imsgbuf *ibuf, struct imsg *imsg, size_t datalen)
static void
handle_imsg_log(struct imsgbuf *ibuf, struct imsg *imsg, size_t datalen)
{
char *msg;
int priority, quit;
char *msg;
msg = imsg->data;
msg[datalen-1] = '\0';
priority = imsg->hdr.peerid;
quit = 0;
if (priority == LOG_CRIT) {
quit = 1;
priority = LOG_ERR;
}
if (conf.foreground) {
print_date();
fprintf(stderr, "%s\n", msg);
} else
syslog(LOG_DAEMON | imsg->hdr.peerid, "%s", msg);
syslog(LOG_DAEMON | priority, "%s", msg);
if (quit)
exit(1);
}
static void