socket: add option for SO_PASSEC

[elogind.git] / src / log.h

diff --git a/src/log.h b/src/log.h
index 6df1d59961f66cfd98f461a57e11e6ef8c69b8e8..7028a13275fce78d0fa91f566881a47aa5dcd4eb 100644 (file)
--- 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,16 +23,19 @@
 ***/
 
 #include <syslog.h>
+#include <stdbool.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;
@@ -43,12 +46,21 @@ void log_set_max_level(int level);
 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);
 
@@ -59,13 +71,20 @@ int log_meta(
         const char*file,
         int line,
         const char *func,
-        const char *format, ...) _printf_attr(5,6);
+        const char *format, ...) _printf_attr_(5,6);
+
+_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);
 
-_noreturn void log_assert(
+/* This modifies the buffer passed! */
+int log_dump_internal(
+        int level,
         const char*file,
         int line,
         const char *func,
-        const char *format, ...) _printf_attr(4,5);
+        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__)
@@ -73,6 +92,9 @@ _noreturn void log_assert(
 #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define log_error(...)   log_meta(LOG_ERR,     __FILE__, __LINE__, __func__, __VA_ARGS__)
 
+/* This modifies the buffer passed! */
+#define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)
+
 const char *log_target_to_string(LogTarget target);
 LogTarget log_target_from_string(const char *s);