chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs-util: add new CHASE_NON_EXISTING flag to chase_symlinks()
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index a158212d586a0cbb82d1817f2278b0ec1b0517d0..2f54194ebd17bf4066ecf1a01418bd9f33ac1427 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-37,7
+37,7
@@
#include "alloc-util.h"
#include "fd-util.h"
#include "alloc-util.h"
#include "fd-util.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "io-util.h"
#include "log.h"
#include "macro.h"
#include "io-util.h"
#include "log.h"
#include "macro.h"
@@
-342,8
+342,6
@@
static int write_to_console(
const char *file,
int line,
const char *func,
const char *file,
int line,
const char *func,
- const char *object_field,
- const char *object,
const char *buffer) {
char location[256], prefix[1 + DECIMAL_STR_MAX(int) + 2];
const char *buffer) {
char location[256], prefix[1 + DECIMAL_STR_MAX(int) + 2];
@@
-402,8
+400,6
@@
static int write_to_syslog(
const char *file,
int line,
const char *func,
const char *file,
int line,
const char *func,
- const char *object_field,
- const char *object,
const char *buffer) {
char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
const char *buffer) {
char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
@@
-465,8
+461,6
@@
static int write_to_kmsg(
const char *file,
int line,
const char *func,
const char *file,
int line,
const char *func,
- const char *object_field,
- const char *object,
const char *buffer) {
char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
const char *buffer) {
char header_priority[2 + DECIMAL_STR_MAX(int) + 1],
@@
-498,7
+492,8
@@
static int log_do_header(
int level,
int error,
const char *file, int line, const char *func,
int level,
int error,
const char *file, int line, const char *func,
- const char *object_field, const char *object) {
+ const char *object_field, const char *object,
+ const char *extra_field, const char *extra) {
snprintf(header, size,
"PRIORITY=%i\n"
snprintf(header, size,
"PRIORITY=%i\n"
@@
-508,6
+503,7
@@
static int log_do_header(
"%s%s%s"
"%s%.*i%s"
"%s%s%s"
"%s%s%s"
"%s%.*i%s"
"%s%s%s"
+ "%s%s%s"
"SYSLOG_IDENTIFIER=%s\n",
LOG_PRI(level),
LOG_FAC(level),
"SYSLOG_IDENTIFIER=%s\n",
LOG_PRI(level),
LOG_FAC(level),
@@
-526,6
+522,9
@@
static int log_do_header(
isempty(object) ? "" : object_field,
isempty(object) ? "" : object,
isempty(object) ? "" : "\n",
isempty(object) ? "" : object_field,
isempty(object) ? "" : object,
isempty(object) ? "" : "\n",
+ isempty(extra) ? "" : extra_field,
+ isempty(extra) ? "" : extra,
+ isempty(extra) ? "" : "\n",
program_invocation_short_name);
return 0;
program_invocation_short_name);
return 0;
@@
-539,6
+538,8
@@
static int write_to_journal(
const char *func,
const char *object_field,
const char *object,
const char *func,
const char *object_field,
const char *object,
+ const char *extra_field,
+ const char *extra,
const char *buffer) {
char header[LINE_MAX];
const char *buffer) {
char header[LINE_MAX];
@@
-548,7
+549,7
@@
static int write_to_journal(
if (journal_fd < 0)
return 0;
if (journal_fd < 0)
return 0;
- log_do_header(header, sizeof(header), level, error, file, line, func, object_field, object);
+ log_do_header(header, sizeof(header), level, error, file, line, func, object_field, object
, extra_field, extra
);
IOVEC_SET_STRING(iovec[0], header);
IOVEC_SET_STRING(iovec[1], "MESSAGE=");
IOVEC_SET_STRING(iovec[0], header);
IOVEC_SET_STRING(iovec[1], "MESSAGE=");
@@
-573,6
+574,8
@@
static int log_dispatch(
const char *func,
const char *object_field,
const char *object,
const char *func,
const char *object_field,
const char *object,
+ const char *extra,
+ const char *extra_field,
char *buffer) {
assert(buffer);
char *buffer) {
assert(buffer);
@@
-604,7
+607,7
@@
static int log_dispatch(
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) {
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) {
- k = write_to_journal(level, error, file, line, func, object_field, object, buffer);
+ k = write_to_journal(level, error, file, line, func, object_field, object,
extra_field, extra,
buffer);
if (k < 0) {
if (k != -EAGAIN)
log_close_journal();
if (k < 0) {
if (k != -EAGAIN)
log_close_journal();
@@
-616,7
+619,7
@@
static int log_dispatch(
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG) {
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG) {
- k = write_to_syslog(level, error, file, line, func,
object_field, object,
buffer);
+ k = write_to_syslog(level, error, file, line, func, buffer);
if (k < 0) {
if (k != -EAGAIN)
log_close_syslog();
if (k < 0) {
if (k != -EAGAIN)
log_close_syslog();
@@
-631,7
+634,7
@@
static int log_dispatch(
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_KMSG)) {
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);
+ k = write_to_kmsg(level, error, file, line, func, buffer);
if (k < 0) {
log_close_kmsg();
log_open_console();
if (k < 0) {
log_close_kmsg();
log_open_console();
@@
-639,7
+642,7
@@
static int log_dispatch(
}
if (k <= 0)
}
if (k <= 0)
- (void) write_to_console(level, error, file, line, func,
object_field, object,
buffer);
+ (void) write_to_console(level, error, file, line, func, buffer);
buffer = e;
} while (buffer);
buffer = e;
} while (buffer);
@@
-665,7
+668,7
@@
int log_dump_internal(
if (_likely_(LOG_PRI(level) > log_max_level))
return -error;
if (_likely_(LOG_PRI(level) > log_max_level))
return -error;
- return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
+ return log_dispatch(level, error, file, line, func, NULL, NULL,
NULL, NULL,
buffer);
}
int log_internalv(
}
int log_internalv(
@@
-692,7
+695,7
@@
int log_internalv(
vsnprintf(buffer, sizeof(buffer), format, ap);
vsnprintf(buffer, sizeof(buffer), format, ap);
- return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
+ return log_dispatch(level, error, file, line, func, NULL, NULL,
NULL, NULL,
buffer);
}
int log_internal(
}
int log_internal(
@@
-721,6
+724,8
@@
int log_object_internalv(
const char *func,
const char *object_field,
const char *object,
const char *func,
const char *object_field,
const char *object,
+ const char *extra_field,
+ const char *extra,
const char *format,
va_list ap) {
const char *format,
va_list ap) {
@@
-754,7
+759,7
@@
int log_object_internalv(
vsnprintf(b, l, format, ap);
vsnprintf(b, l, format, ap);
- return log_dispatch(level, error, file, line, func, object_field, object, buffer);
+ return log_dispatch(level, error, file, line, func, object_field, object,
extra_field, extra,
buffer);
}
int log_object_internal(
}
int log_object_internal(
@@
-765,13
+770,15
@@
int log_object_internal(
const char *func,
const char *object_field,
const char *object,
const char *func,
const char *object_field,
const char *object,
+ const char *extra_field,
+ const char *extra,
const char *format, ...) {
va_list ap;
int r;
va_start(ap, format);
const char *format, ...) {
va_list ap;
int r;
va_start(ap, format);
- r = log_object_internalv(level, error, file, line, func, object_field, object, format, ap);
+ r = log_object_internalv(level, error, file, line, func, object_field, object,
extra_field, extra,
format, ap);
va_end(ap);
return r;
va_end(ap);
return r;
@@
-791,12
+798,12
@@
static void log_assert(
return;
DISABLE_WARNING_FORMAT_NONLITERAL;
return;
DISABLE_WARNING_FORMAT_NONLITERAL;
-
xsprintf(
buffer, format, text, file, line, func);
+
snprintf(buffer, sizeof
buffer, format, text, file, line, func);
REENABLE_WARNING;
log_abort_msg = buffer;
REENABLE_WARNING;
log_abort_msg = buffer;
- log_dispatch(level, 0, file, line, func, NULL, NULL, buffer);
+ log_dispatch(level, 0, file, line, func, NULL, NULL,
NULL, NULL,
buffer);
}
noreturn void log_assert_failed(const char *text, const char *file, int line, const char *func) {
}
noreturn void log_assert_failed(const char *text, const char *file, int line, const char *func) {
@@
-905,7
+912,7
@@
int log_struct_internal(
bool fallback = false;
/* If the journal is available do structured logging */
bool fallback = false;
/* If the journal is available do structured logging */
- log_do_header(header, sizeof(header), level, error, file, line, func, NULL, NULL);
+ log_do_header(header, sizeof(header), level, error, file, line, func, NULL, NULL
, NULL, NULL
);
IOVEC_SET_STRING(iovec[n++], header);
va_start(ap, format);
IOVEC_SET_STRING(iovec[n++], header);
va_start(ap, format);
@@
-953,7
+960,7
@@
int log_struct_internal(
if (!found)
return -error;
if (!found)
return -error;
- return log_dispatch(level, error, file, line, func, NULL, NULL, buf + 8);
+ return log_dispatch(level, error, file, line, func, NULL, NULL,
NULL, NULL,
buf + 8);
}
int log_set_target_from_string(const char *e) {
}
int log_set_target_from_string(const char *e) {
@@
-978,7
+985,7
@@
int log_set_max_level_from_string(const char *e) {
return 0;
}
return 0;
}
-static int parse_proc_cmdline_item(const char *key, const char *value) {
+static int parse_proc_cmdline_item(const char *key, const char *value
, void *data
) {
/*
* The systemd.log_xyz= settings are parsed by all tools, and
/*
* The systemd.log_xyz= settings are parsed by all tools, and
@@
-1023,7
+1030,7
@@
void log_parse_environment(void) {
/* Only try to read the command line in daemons.
We assume that anything that has a controlling
tty is user stuff. */
/* Only try to read the command line in daemons.
We assume that anything that has a controlling
tty is user stuff. */
- (void) parse_proc_cmdline(parse_proc_cmdline_item);
+ (void) parse_proc_cmdline(parse_proc_cmdline_item
, NULL, true
);
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)
e = secure_getenv("SYSTEMD_LOG_TARGET");
if (e && log_set_target_from_string(e) < 0)