X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flog.h;h=a3e23a855cf570e5db94ef6151a807324bb648ae;hb=c73d180dc4bbd87c945a524b42b672af2ffe2609;hp=ac20a985c5eec1248337de09ef21dcc68819e61a;hpb=87ff6b1c2a607c47b2374c5be41ac01302714979;p=elogind.git

diff --git a/src/shared/log.h b/src/shared/log.h
index ac20a985c..a3e23a855 100644
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -21,9 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <syslog.h>
 #include <stdbool.h>
 #include <stdarg.h>
+#include <syslog.h>
+#include <sys/signalfd.h>
 #include <errno.h>
 
 #include "macro.h"
@@ -51,7 +52,9 @@ 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);
+bool log_get_show_color(void) _pure_;
 void log_show_location(bool b);
+bool log_get_show_location(void) _pure_;
 
 int log_show_color_from_string(const char *e);
 int log_show_location_from_string(const char *e);
@@ -124,13 +127,19 @@ int log_dump_internal(
                 const char *func,
                 char *buffer);
 
-_noreturn_ void log_assert_failed(
+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_failed_unreachable(
+void log_assert_failed_return(
                 const char *text,
                 const char *file,
                 int line,
@@ -139,7 +148,7 @@ _noreturn_ void log_assert_failed_unreachable(
 #define log_full(level, ...) \
 do { \
         if (log_get_max_level() >= (level)) \
-                log_meta(LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__); \
+                log_meta((level), __FILE__, __LINE__, __func__, __VA_ARGS__); \
 } while (0)
 
 #define log_debug(...)   log_full(LOG_DEBUG,   __VA_ARGS__)
@@ -148,6 +157,12 @@ do { \
 #define log_warning(...) log_full(LOG_WARNING, __VA_ARGS__)
 #define log_error(...)   log_full(LOG_ERR,     __VA_ARGS__)
 
+#ifdef LOG_TRACE
+#  define log_trace(...) log_debug(__VA_ARGS__)
+#else
+#  define log_trace(...) do {} while(0)
+#endif
+
 #define log_struct(level, ...) log_struct_internal(level, __FILE__, __LINE__, __func__, __VA_ARGS__)
 
 #define log_oom() log_oom_internal(__FILE__, __LINE__, __func__)
@@ -161,3 +176,7 @@ const char *log_target_to_string(LogTarget target) _const_;
 LogTarget log_target_from_string(const char *s) _pure_;
 
 #define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
+
+void log_received_signal(int level, const struct signalfd_siginfo *si);
+
+void log_set_upgrade_syslog_to_journal(bool b);