chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add tests for environment serialization
[elogind.git]
/
src
/
basic
/
log.h
diff --git
a/src/basic/log.h
b/src/basic/log.h
index 2e1d8c5833bde82794d36f65d3798d3fa29ea77f..8353394ffac950e133fab1e3d72caf97b120c23e 100644
(file)
--- a/
src/basic/log.h
+++ b/
src/basic/log.h
@@
-77,6
+77,18
@@
void log_close_console(void);
void log_parse_environment(void);
void log_parse_environment(void);
+int log_dispatch_internal(
+ int level,
+ int error,
+ const char *file,
+ int line,
+ const char *func,
+ const char *object_field,
+ const char *object,
+ const char *extra,
+ const char *extra_field,
+ char *buffer);
+
int log_internal(
int level,
int error,
int log_internal(
int level,
int error,
@@
-117,7
+129,7
@@
int log_object_internalv(
const char *extra_field,
const char *extra,
const char *format,
const char *extra_field,
const char *extra,
const char *format,
- va_list ap) _printf_(
9
,0);
+ va_list ap) _printf_(
10
,0);
int log_struct_internal(
int level,
int log_struct_internal(
int level,
@@
-139,7
+151,7
@@
int log_format_iovec(
bool newline_separator,
int error,
const char *format,
bool newline_separator,
int error,
const char *format,
- va_list ap);
+ va_list ap)
_printf_(6, 0)
;
/* This modifies the buffer passed! */
int log_dump_internal(
/* This modifies the buffer passed! */
int log_dump_internal(
@@
-169,6
+181,9
@@
void log_assert_failed_return(
int line,
const char *func);
int line,
const char *func);
+#define log_dispatch(level, error, buffer) \
+ log_dispatch_internal(level, error, __FILE__, __LINE__, __func__, NULL, NULL, NULL, NULL, buffer)
+
/* Logging with level */
#define log_full_errno(level, error, ...) \
({ \
/* Logging with level */
#define log_full_errno(level, error, ...) \
({ \
@@
-221,14
+236,14
@@
bool log_on_console(void) _pure_;
const char *log_target_to_string(LogTarget target) _const_;
LogTarget log_target_from_string(const char *s) _pure_;
const char *log_target_to_string(LogTarget target) _const_;
LogTarget log_target_from_string(const char *s) _pure_;
-/* Helper
s to prepare various fields
for structured logging */
+/* Helper
to prepare various field
for structured logging */
#define LOG_MESSAGE(fmt, ...) "MESSAGE=" fmt, ##__VA_ARGS__
#define LOG_MESSAGE(fmt, ...) "MESSAGE=" fmt, ##__VA_ARGS__
-#define LOG_MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
#if 0 /// UNNEEDED by elogind
void log_received_signal(int level, const struct signalfd_siginfo *si);
void log_set_upgrade_syslog_to_journal(bool b);
#if 0 /// UNNEEDED by elogind
void log_received_signal(int level, const struct signalfd_siginfo *si);
void log_set_upgrade_syslog_to_journal(bool b);
+void log_set_always_reopen_console(bool b);
#endif // 0
int log_syntax_internal(
#endif // 0
int log_syntax_internal(