X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flog.h;h=3283808ff88cbdc3c201d06a96693e598cc4c94b;hp=9d141dcdda773a36fb2a13185581b3734fe2d905;hb=3eff4208ffecedd778fec260f0d4b18e94dab443;hpb=2149e37c7954fd98acd54269df5f5eca78eb9d5b

diff --git a/src/log.h b/src/log.h
index 9d141dcdd..3283808ff 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foologhfoo
 #define foologhfoo
@@ -23,32 +23,46 @@
 ***/
 
 #include <syslog.h>
+#include <stdbool.h>
+#include <stdarg.h>
 
 #include "macro.h"
 
-/* If set to SYSLOG and /dev/log can not be opened we fall back to
- * KSMG. If KMSG fails, we fall back to CONSOLE */
 typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
         LOG_TARGET_KMSG,
+        LOG_TARGET_JOURNAL,
+        LOG_TARGET_JOURNAL_OR_KMSG,
         LOG_TARGET_SYSLOG,
         LOG_TARGET_SYSLOG_OR_KMSG,
+        LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
+        LOG_TARGET_NULL,
         _LOG_TARGET_MAX,
         _LOG_TARGET_INVALID = -1
 }  LogTarget;
 
 void log_set_target(LogTarget target);
 void log_set_max_level(int level);
+void log_set_facility(int facility);
 
 int log_set_target_from_string(const char *e);
 int log_set_max_level_from_string(const char *e);
 
+void log_show_color(bool b);
+void log_show_location(bool b);
+
+int log_show_color_from_string(const char *e);
+int log_show_location_from_string(const char *e);
+
 LogTarget log_get_target(void);
 int log_get_max_level(void);
 
 int log_open(void);
+void log_close(void);
+void log_forget_fds(void);
 
 void log_close_syslog(void);
+void log_close_journal(void);
 void log_close_kmsg(void);
 void log_close_console(void);
 
@@ -61,11 +75,16 @@ int log_meta(
         const char *func,
         const char *format, ...) _printf_attr_(5,6);
 
-_noreturn_ void log_assert(
+int log_metav(
+        int level,
         const char*file,
         int line,
         const char *func,
-        const char *format, ...) _printf_attr_(4,5);
+        const char *format,
+        va_list ap);
+
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func);
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func);
 
 /* This modifies the buffer passed! */
 int log_dump_internal(
@@ -75,6 +94,8 @@ int log_dump_internal(
         const char *func,
         char *buffer);
 
+#define log_full(level, ...) log_meta(level,   __FILE__, __LINE__, __func__, __VA_ARGS__)
+
 #define log_debug(...)   log_meta(LOG_DEBUG,   __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define log_info(...)    log_meta(LOG_INFO,    __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define log_notice(...)  log_meta(LOG_NOTICE,  __FILE__, __LINE__, __func__, __VA_ARGS__)