static int syslog_fd = -1;
static int kmsg_fd = -1;
+/* Akin to glibc's __abort_msg; which is private and we hance cannot
+ * use here. */
+static char *log_abort_msg = NULL;
+
void log_close_kmsg(void) {
if (kmsg_fd >= 0) {
- close_nointr(kmsg_fd);
+ close_nointr_nofail(kmsg_fd);
kmsg_fd = -1;
}
}
if (kmsg_fd >= 0)
return 0;
- if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0)
+ if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
+ log_info("Failed to open syslog for logging: %s", strerror(errno));
return -errno;
+ }
log_info("Succesfully opened /dev/kmsg for logging.");
void log_close_syslog(void) {
if (syslog_fd >= 0) {
- close_nointr(syslog_fd);
+ close_nointr_nofail(syslog_fd);
syslog_fd = -1;
}
}
if (connect(syslog_fd, &sa.sa, sizeof(sa)) < 0) {
r = -errno;
log_close_syslog();
- return -errno;
+
+ log_info("Failed to open syslog for logging: %s", strerror(-r));
+ return r;
}
log_info("Succesfully opened syslog for logging.");
return 0;
}
+#define LOG_DISPATCH(level,file,line,func,format) \
+ do { \
+ va_list _ap; \
+ bool written = false; \
+ if (log_target == LOG_TARGET_KMSG) { \
+ va_start(_ap, format); \
+ written = write_to_kmsg(level, file, line, func, format, _ap) >= 0; \
+ va_end(_ap); \
+ } else if (log_target == LOG_TARGET_SYSLOG) { \
+ va_start(_ap, format); \
+ written = write_to_syslog(level, file, line, func, format, _ap) >= 0; \
+ va_end(_ap); \
+ } \
+ if (!written) { \
+ va_start(_ap, format); \
+ write_to_console(level, file, line, func, format, _ap); \
+ va_end(_ap); \
+ } \
+ } while (false)
+
void log_meta(
int level,
const char*file,
const char *func,
const char *format, ...) {
- va_list ap;
- bool written;
int saved_errno;
- if (LOG_PRI(level) > log_max_level)
+ if (_likely(LOG_PRI(level) > log_max_level))
return;
saved_errno = errno;
- written = false;
-
- if (log_target == LOG_TARGET_KMSG) {
- va_start(ap, format);
- written = write_to_kmsg(level, file, line, func, format, ap) >= 0;
- va_end(ap);
- } else if (log_target == LOG_TARGET_SYSLOG) {
- va_start(ap, format);
- written = write_to_syslog(level, file, line, func, format, ap) >= 0;
- va_end(ap);
- }
+ LOG_DISPATCH(level, file, line, func, format);
+ errno = saved_errno;
+}
- if (!written) {
- va_start(ap, format);
- write_to_console(level, file, line, func, format, ap);
- va_end(ap);
- }
+void log_assert(
+ const char*file,
+ int line,
+ const char *func,
+ const char *format, ...) {
+
+ static char buffer[LOG_BUFFER_MAX];
+ va_list ap;
+ int saved_errno = errno;
+ va_start(ap, format);
+ vsnprintf(buffer, sizeof(buffer), format, ap);
+ va_end(ap);
+
+ char_array_0(buffer);
+ log_abort_msg = buffer;
+
+ LOG_DISPATCH(LOG_CRIT, file, line, func, format);
+ abort();
+
+ /* If the user chose to ignore this SIGABRT, we are happy to go on, as if nothing happened. */
errno = saved_errno;
}
log_warning("Failed to parse log level %s. Ignoring.", e);
}
+LogTarget log_get_target(void) {
+ return log_target;
+}
+
+int log_get_max_level(void) {
+ return log_max_level;
+}
+
static const char *const log_target_table[] = {
[LOG_TARGET_CONSOLE] = "console",
[LOG_TARGET_SYSLOG] = "syslog",