STREAM_RUNNING
} StreamState;
-typedef enum LogTarget {
- LOG_TARGET_SYSLOG,
- LOG_TARGET_KMSG
-} LogTarget;
-
struct Stream {
Server *server;
LIST_FIELDS(Stream, stream);
};
-#define IOVEC_SET_STRING(iovec, s) \
- do { \
- (iovec).iov_base = s; \
- (iovec).iov_len = strlen(s); \
- } while(false);
-
static int stream_log(Stream *s, char *p, usec_t timestamp) {
char header_priority[16], header_time[64], header_pid[16];
- struct msghdr msghdr;
struct iovec iovec[5];
assert(s);
IOVEC_SET_STRING(iovec[0], header_priority);
if (s->target == LOG_TARGET_SYSLOG) {
+ struct msghdr msghdr;
+
IOVEC_SET_STRING(iovec[1], header_time);
IOVEC_SET_STRING(iovec[2], s->process);
IOVEC_SET_STRING(iovec[3], header_pid);
if (s->server)
epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL);
- assert_se(close_nointr(s->fd) == 0);
+ close_nointr_nofail(s->fd);
}
free(s->process);
if (s->n_streams >= STREAMS_MAX) {
log_warning("Too many connections, refusing connection.");
- assert_se(close_nointr(fd) == 0);
+ close_nointr_nofail(fd);
return 0;
}
if (!(stream = new0(Stream, 1))) {
- assert_se(close_nointr(fd) == 0);
+ close_nointr_nofail(fd);
return -ENOMEM;
}
stream_free(s->streams);
for (i = 0; i < s->n_server_fd; i++)
- assert_se(close_nointr(SERVER_FD_START+i) == 0);
+ close_nointr_nofail(SERVER_FD_START+i);
if (s->syslog_fd >= 0)
- assert_se(close_nointr(s->syslog_fd) == 0);
+ close_nointr_nofail(s->syslog_fd);
if (s->epoll_fd >= 0)
- assert_se(close_nointr(s->epoll_fd) == 0);
+ close_nointr_nofail(s->epoll_fd);
if (s->kmsg_fd >= 0)
- assert_se(close_nointr(s->kmsg_fd) == 0);
+ close_nointr_nofail(s->kmsg_fd);
}
static int server_init(Server *s, unsigned n_sockets) {
if (k <= 0)
break;
- if ((r = process_event(&server, &event)) < 0)
+ if ((k = process_event(&server, &event)) < 0)
goto fail;
}
r = 0;