#include <sys/socket.h>
#include <sys/un.h>
#include <stddef.h>
-#include <printf.h>
+#include "parse-printf-format.h"
#include "sd-messages.h"
#include "log.h"
#include "util.h"
static bool show_color = false;
static bool show_location = false;
-static bool upgrade_syslog_to_journal = false;
+/// UNNEEDED by elogind static bool upgrade_syslog_to_journal = false;
/* Akin to glibc's __abort_msg; which is private and we hence cannot
* use here. */
return r;
}
+/// UNNEEDED by elogind
+#if 0
void log_close_journal(void) {
journal_fd = safe_close(journal_fd);
}
log_close_journal();
return r;
}
+#endif // 0
int log_open(void) {
int r;
* because there is no reason to close it. */
if (log_target == LOG_TARGET_NULL) {
- log_close_journal();
+ /// UNNEEDED by elogind log_close_journal();
log_close_syslog();
log_close_console();
return 0;
getpid() == 1 ||
isatty(STDERR_FILENO) <= 0) {
+/// elogind does not support logging to systemd-journald
+#if 0
if (log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) {
return r;
}
}
-
+#endif // 0
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG) {
r = log_open_syslog();
if (r >= 0) {
- log_close_journal();
+ /// UNNEEDED by elogind log_close_journal();
log_close_console();
return r;
}
if (log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_SAFE ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
+ /// UNNEEDED by elogind log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_KMSG) {
r = log_open_kmsg();
if (r >= 0) {
- log_close_journal();
+ /// UNNEEDED by elogind log_close_journal();
log_close_syslog();
log_close_console();
return r;
}
}
- log_close_journal();
+ /// UNNEEDED by elogind log_close_journal();
log_close_syslog();
return log_open_console();
assert(target >= 0);
assert(target < _LOG_TARGET_MAX);
+/// elogind does not support logging to systemd-journald
+#if 0
if (upgrade_syslog_to_journal) {
if (target == LOG_TARGET_SYSLOG)
target = LOG_TARGET_JOURNAL;
else if (target == LOG_TARGET_SYSLOG_OR_KMSG)
target = LOG_TARGET_JOURNAL_OR_KMSG;
}
+#endif // 0
log_target = target;
}
void log_close(void) {
- log_close_journal();
+ /// UNNEDED by elogind log_close_journal();
log_close_syslog();
log_close_kmsg();
log_close_console();
}
+/// UNNEEDED by elogind
+#if 0
void log_forget_fds(void) {
console_fd = kmsg_fd = syslog_fd = journal_fd = -1;
}
+#endif // 0
void log_set_max_level(int level) {
assert((level & LOG_PRIMASK) == level);
return 1;
}
+/// UNNEEDED by elogind
+#if 0
static int log_do_header(
char *header,
size_t size,
return 1;
}
+#endif // 0
static int log_dispatch(
int level,
if ((e = strpbrk(buffer, NEWLINE)))
*(e++) = 0;
+/// elogind does not support logging to systemd-journald
+#if 0
if (log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) {
log_open_kmsg();
}
}
+#endif // 0
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG) {
(log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_SAFE ||
log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
+ /// UNNEEDED by elogind log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_KMSG)) {
k = write_to_kmsg(level, error, file, line, func, object_field, object, buffer);
if ((level & LOG_FACMASK) == 0)
level = log_facility | LOG_PRI(level);
+/// elogind does not support logging to systemd-journald
+#if 0
if ((log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) &&
if (!fallback)
return -error;
}
+#endif // 0
/* Fallback if journal logging is not available or didn't work. */
[LOG_TARGET_CONSOLE] = "console",
[LOG_TARGET_CONSOLE_PREFIXED] = "console-prefixed",
[LOG_TARGET_KMSG] = "kmsg",
+/// elogind does not support logging to systemd-journald
+#if 0
[LOG_TARGET_JOURNAL] = "journal",
[LOG_TARGET_JOURNAL_OR_KMSG] = "journal-or-kmsg",
+#endif // 0
[LOG_TARGET_SYSLOG] = "syslog",
[LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg",
[LOG_TARGET_AUTO] = "auto",
DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);
+/// UNNEEDED by elogind
+#if 0
void log_received_signal(int level, const struct signalfd_siginfo *si) {
if (si->ssi_pid > 0) {
_cleanup_free_ char *p = NULL;
void log_set_upgrade_syslog_to_journal(bool b) {
upgrade_syslog_to_journal = b;
}
+#endif // 0
int log_syntax_internal(
const char *unit,