#include "macro.h"
#include "socket-util.h"
-#define SOCKET_TIMEOUT_USEC (5*USEC_PER_SEC)
+#define SNDBUF_SIZE (8*1024*1024)
static LogTarget log_target = LOG_TARGET_CONSOLE;
static int log_max_level = LOG_INFO;
}
static int create_log_socket(int type) {
- struct timeval tv;
int fd;
- if (getpid() == 1)
- /* systemd should not block on syslog */
- type |= SOCK_NONBLOCK;
+ /* All output to the syslog/journal fds we do asynchronously,
+ * and if the buffers are full we just drop the messages */
- fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0);
+ fd = socket(AF_UNIX, type|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (fd < 0)
return -errno;
- /* Make sure we don't block for more than 5s when talking to
- * syslog */
- timeval_store(&tv, SOCKET_TIMEOUT_USEC);
- if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
+ fd_inc_sndbuf(fd, SNDBUF_SIZE);
return fd;
}
return r;
}
-void log_assert(
- const char*file,
- int line,
- const char *func,
- const char *format, ...) {
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+_noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
static char buffer[LINE_MAX];
- int saved_errno = errno;
- va_list ap;
- va_start(ap, format);
- vsnprintf(buffer, sizeof(buffer), format, ap);
- va_end(ap);
+ snprintf(buffer, sizeof(buffer), format, text, file, line, func);
char_array_0(buffer);
log_abort_msg = buffer;
log_dispatch(LOG_CRIT, file, line, func, buffer);
abort();
+}
+#pragma GCC diagnostic pop
- /* If the user chose to ignore this SIGABRT, we are happy to go on, as if nothing happened. */
- errno = saved_errno;
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func) {
+ log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
+}
+
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
+ log_assert(text, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
}
int log_set_target_from_string(const char *e) {