X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=log.h;h=6df1d59961f66cfd98f461a57e11e6ef8c69b8e8;hp=f424c191fa30c99708fb7ab4efb1d9eadbdf9391;hb=37a8e6831650bdf6439038d802775b182fa599e7;hpb=1adf1049dc9def8d8df405bab7f5ae08e1e9573d

diff --git a/log.h b/log.h
index f424c191f..6df1d5996 100644
--- a/log.h
+++ b/log.h
@@ -26,10 +26,13 @@
 
 #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_SYSLOG,
         LOG_TARGET_KMSG,
+        LOG_TARGET_SYSLOG,
+        LOG_TARGET_SYSLOG_OR_KMSG,
         _LOG_TARGET_MAX,
         _LOG_TARGET_INVALID = -1
 }  LogTarget;
@@ -43,20 +46,27 @@ int log_set_max_level_from_string(const char *e);
 LogTarget log_get_target(void);
 int log_get_max_level(void);
 
-void log_close_kmsg(void);
-int log_open_kmsg(void);
+int log_open(void);
+
 void log_close_syslog(void);
-int log_open_syslog(void);
+void log_close_kmsg(void);
+void log_close_console(void);
 
 void log_parse_environment(void);
 
-void log_meta(
+int log_meta(
         int level,
         const char*file,
         int line,
         const char *func,
         const char *format, ...) _printf_attr(5,6);
 
+_noreturn void log_assert(
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) _printf_attr(4,5);
+
 #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__)