X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Flog.h;h=4325215b977229c3e062501f3d90d3f1780c7b0a;hb=6917418372a990fbfe9a39864ccefacb37c70cc8;hp=569762d083aee8b10cf8d571ba2698a4d0092a30;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927;p=elogind.git

diff --git a/src/basic/log.h b/src/basic/log.h
index 569762d08..4325215b9 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -21,22 +21,26 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdbool.h>
+#include <errno.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdlib.h>
-#include <syslog.h>
 #include <sys/signalfd.h>
-#include <errno.h>
+#include <syslog.h>
 
 #include "sd-id128.h"
+
 #include "macro.h"
 
 typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
         LOG_TARGET_CONSOLE_PREFIXED,
         LOG_TARGET_KMSG,
+/// elogind does not support logging to systemd-journald
+#if 0
         LOG_TARGET_JOURNAL,
         LOG_TARGET_JOURNAL_OR_KMSG,
+#endif // 0
         LOG_TARGET_SYSLOG,
         LOG_TARGET_SYSLOG_OR_KMSG,
         LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
@@ -66,10 +70,15 @@ int log_get_max_level(void) _pure_;
 
 int log_open(void);
 void log_close(void);
+/// UNNEEDED by elogind
+#if 0
 void log_forget_fds(void);
-
+#endif // 0
 void log_close_syslog(void);
+/// UNNEEDED by elogind
+#if 0
 void log_close_journal(void);
+#endif // 0
 void log_close_kmsg(void);
 void log_close_console(void);
 
@@ -187,6 +196,12 @@ void log_assert_failed_return(
 #  define log_trace(...) do {} while(0)
 #endif
 
+#ifdef ENABLE_DEBUG_ELOGIND
+#  define log_debug_elogind(...) log_debug(__VA_ARGS__);usleep(25*USEC_PER_MSEC)
+#else
+#  define log_debug_elogind(...) do {} while(0)
+#endif // ENABLE_DEBUG_ELOGIND
+
 /* Structured logging */
 #define log_struct(level, ...) log_struct_internal(level, 0, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define log_struct_errno(level, error, ...) log_struct_internal(level, error, __FILE__, __LINE__, __func__, __VA_ARGS__)
@@ -205,9 +220,12 @@ LogTarget log_target_from_string(const char *s) _pure_;
 #define LOG_MESSAGE(fmt, ...) "MESSAGE=" fmt, ##__VA_ARGS__
 #define LOG_MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
 
+/// UNNEEDED by elogind
+#if 0
 void log_received_signal(int level, const struct signalfd_siginfo *si);
 
 void log_set_upgrade_syslog_to_journal(bool b);
+#endif // 0
 
 int log_syntax_internal(
                 const char *unit,
@@ -227,3 +245,15 @@ int log_syntax_internal(
                         ? log_syntax_internal(unit, _level, config_file, config_line, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
                         : -abs(_e);                                     \
         })
+
+#define log_syntax_invalid_utf8(unit, level, config_file, config_line, rvalue) \
+        ({                                                              \
+                int _level = (level);                                   \
+                if (log_get_max_level() >= LOG_PRI(_level)) {           \
+                        _cleanup_free_ char *_p = NULL;                 \
+                        _p = utf8_escape_invalid(rvalue);               \
+                        log_syntax_internal(unit, _level, config_file, config_line, 0, __FILE__, __LINE__, __func__, \
+                                            "String is not UTF-8 clean, ignoring assignment: %s", strna(_p)); \
+                }                                                       \
+                -EINVAL;                                                \
+        })