mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-10-18 09:58:43 +00:00
Code Releases Activity

Flock: the logger actually works, lol,

Browse Source
This commit is contained in:
Maria Matejka 2024-10-02 23:09:55 +02:00
parent e74a3af6d2
commit 8cc7596e44
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flock/container.c
View File

@ -196,24 +196,29 @@ struct container_logger {
}; };
static int static int
container_logger_rx(sock *sk, uint _sz UNUSED) container_logger_rx(sock *sk, uint sz)
{ {
struct container_logger *clg = sk->data; struct container_logger *clg = sk->data;
ssize_t sz = read(sk->fd, clg->ws->tpos, clg->ws->tbsize - (clg->ws->tpos - clg->ws->tbuf)); if (clg->ws->tpos + sz >= clg->ws->tbuf + clg->ws->tbsize)
if (sz < 0) log(L_INFO "dropping a log message");
return CALL(sk->err_hook, sk, errno), 0;
memcpy(clg->ws->tpos, sk->rbuf, sz);
clg->ws->tpos[sz] = '\n';
if (clg->ws->tpos == clg->ws->tbuf) if (clg->ws->tpos == clg->ws->tbuf)
sk_send(clg->ws, sz); sk_send(clg->ws, sz + 1);
else else
clg->ws->tpos += sz; clg->ws->tpos += sz + 1;
return 1; return 0;
} }
static void static void
container_logger_rerr(sock *sk UNUSED, int err) container_logger_rerr(sock *sk UNUSED, int err)
{ {
if (!err)
bug("what");
die("Logger receiver socket closed unexpectedly: %s", strerror(err)); die("Logger receiver socket closed unexpectedly: %s", strerror(err));
} }
@ -233,6 +238,7 @@ container_init_logger(void)
s->type = SK_MAGIC; s->type = SK_MAGIC;
s->rx_hook = container_logger_rx; s->rx_hook = container_logger_rx;
s->err_hook = container_logger_rerr; s->err_hook = container_logger_rerr;
sk_set_rbsize(s, 16384);
unlink("/dev/log"); unlink("/dev/log");
s->fd = SYSCALL(socket, AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0); s->fd = SYSCALL(socket, AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@ -253,7 +259,7 @@ container_init_logger(void)
if (sk_open(clg->rs, clg->loop) < 0) if (sk_open(clg->rs, clg->loop) < 0)
bug("Logger failed in sk_open(r): %m"); bug("Logger failed in sk_open(r): %m");
clg->rs->type = SK_UNIX; clg->rs->type = SK_UDP;
s = clg->ws = sk_new(p); s = clg->ws = sk_new(p);
s->data = clg; s->data = clg;