chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time-util: when formatting usec_t as raw integers use PRIu64
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index 7f4ed87ffa43d1b31c1142ea36b9af54d7df725c..6bbaeffaddd00808cc6294764cf9811f08ea97c7 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-249,14
+249,14
@@
int log_open(void) {
return 0;
}
return 0;
}
- if (
(log_target != LOG_TARGET_AUTO && log_target !=
LOG_TARGET_SAFE) ||
+ if (
!IN_SET(log_target, LOG_TARGET_AUTO,
LOG_TARGET_SAFE) ||
getpid() == 1 ||
isatty(STDERR_FILENO) <= 0) {
#if 0 /// elogind does not support logging to systemd-journald
getpid() == 1 ||
isatty(STDERR_FILENO) <= 0) {
#if 0 /// elogind does not support logging to systemd-journald
- if (
log_target == LOG_TARGET_AUTO ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-
log_target == LOG_TARGET_JOURNAL
) {
+ if (
IN_SET(log_target, LOG_TARGET_AUTO,
+ LOG_TARGET_JOURNAL_OR_KMSG,
+
LOG_TARGET_JOURNAL)
) {
r = log_open_journal();
if (r >= 0) {
log_close_syslog();
r = log_open_journal();
if (r >= 0) {
log_close_syslog();
@@
-266,8
+266,8
@@
int log_open(void) {
}
#endif // 0
}
#endif // 0
- if (
log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
-
log_target == LOG_TARGET_SYSLOG
) {
+ if (
IN_SET(log_target, LOG_TARGET_SYSLOG_OR_KMSG,
+
LOG_TARGET_SYSLOG)
) {
r = log_open_syslog();
if (r >= 0) {
log_close_journal();
r = log_open_syslog();
if (r >= 0) {
log_close_journal();
@@
-276,11
+276,11
@@
int log_open(void) {
}
}
}
}
- if (
log_target == LOG_TARGET_AUTO ||
- log_target == LOG_TARGET_SAFE ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
- log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
-
log_target == LOG_TARGET_KMSG
) {
+ if (
IN_SET(log_target, LOG_TARGET_AUTO,
+ LOG_TARGET_SAFE,
+ LOG_TARGET_JOURNAL_OR_KMSG,
+ LOG_TARGET_SYSLOG_OR_KMSG,
+
LOG_TARGET_KMSG)
) {
r = log_open_kmsg();
if (r >= 0) {
log_close_journal();
r = log_open_kmsg();
if (r >= 0) {
log_close_journal();
@@
-513,7
+513,7
@@
static int log_do_header(
line ? "CODE_LINE=" : "",
line ? 1 : 0, line, /* %.0d means no output too, special case for 0 */
line ? "\n" : "",
line ? "CODE_LINE=" : "",
line ? 1 : 0, line, /* %.0d means no output too, special case for 0 */
line ? "\n" : "",
- isempty(func) ? "" : "CODE_FUNC
TION
=",
+ isempty(func) ? "" : "CODE_FUNC=",
isempty(func) ? "" : func,
isempty(func) ? "" : "\n",
error ? "ERRNO=" : "",
isempty(func) ? "" : func,
isempty(func) ? "" : "\n",
error ? "ERRNO=" : "",
@@
-603,9
+603,9
@@
static int log_dispatch(
*(e++) = 0;
#if 0 /// elogind does not support logging to systemd-journald
*(e++) = 0;
#if 0 /// elogind does not support logging to systemd-journald
- if (
log_target == LOG_TARGET_AUTO ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-
log_target == LOG_TARGET_JOURNAL
) {
+ if (
IN_SET(log_target, LOG_TARGET_AUTO,
+ LOG_TARGET_JOURNAL_OR_KMSG,
+
LOG_TARGET_JOURNAL)
) {
k = write_to_journal(level, error, file, line, func, object_field, object, extra_field, extra, buffer);
if (k < 0) {
k = write_to_journal(level, error, file, line, func, object_field, object, extra_field, extra, buffer);
if (k < 0) {
@@
-616,8
+616,8
@@
static int log_dispatch(
}
#endif // 0
}
#endif // 0
- if (
log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
-
log_target == LOG_TARGET_SYSLOG
) {
+ if (
IN_SET(log_target, LOG_TARGET_SYSLOG_OR_KMSG,
+
LOG_TARGET_SYSLOG)
) {
k = write_to_syslog(level, error, file, line, func, buffer);
if (k < 0) {
k = write_to_syslog(level, error, file, line, func, buffer);
if (k < 0) {
@@
-628,11
+628,11
@@
static int log_dispatch(
}
if (k <= 0 &&
}
if (k <= 0 &&
- (log_target == LOG_TARGET_AUTO ||
- log_target == LOG_TARGET_SAFE ||
- log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-
log_target ==
LOG_TARGET_KMSG)) {
+ IN_SET(log_target, LOG_TARGET_AUTO,
+ LOG_TARGET_SAFE,
+ LOG_TARGET_SYSLOG_OR_KMSG,
+ LOG_TARGET_JOURNAL_OR_KMSG,
+
LOG_TARGET_KMSG)) {
k = write_to_kmsg(level, error, file, line, func, buffer);
if (k < 0) {
k = write_to_kmsg(level, error, file, line, func, buffer);
if (k < 0) {
@@
-898,9
+898,9
@@
int log_struct_internal(
level = log_facility | LOG_PRI(level);
#if 0 /// elogind does not support logging to systemd-journald
level = log_facility | LOG_PRI(level);
#if 0 /// elogind does not support logging to systemd-journald
- if (
(log_target == LOG_TARGET_AUTO ||
- log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-
log_target ==
LOG_TARGET_JOURNAL) &&
+ if (
IN_SET(log_target, LOG_TARGET_AUTO,
+ LOG_TARGET_JOURNAL_OR_KMSG,
+
LOG_TARGET_JOURNAL) &&
journal_fd >= 0) {
char header[LINE_MAX];
struct iovec iovec[17] = {};
journal_fd >= 0) {
char header[LINE_MAX];
struct iovec iovec[17] = {};
@@
-1096,8
+1096,8
@@
int log_show_location_from_string(const char *e) {
}
bool log_on_console(void) {
}
bool log_on_console(void) {
- if (
log_target == LOG_TARGET_CONSOLE ||
-
log_target == LOG_TARGET_CONSOLE_PREFIXED
)
+ if (
IN_SET(log_target, LOG_TARGET_CONSOLE,
+
LOG_TARGET_CONSOLE_PREFIXED)
)
return true;
return syslog_fd < 0 && kmsg_fd < 0 && journal_fd < 0;
return true;
return syslog_fd < 0 && kmsg_fd < 0 && journal_fd < 0;