summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-11-02 21:43:32 +0300
committerSven Eden <yamakuzure@gmx.net>2017-11-02 21:43:32 +0300
commit0dcb6bdef04e72f018155d82db49cf4244c6dd33 (patch)
tree60b95dc0391244c3d5832429520304c0ab94487b /src
parentd8072baf33526092d0b94a0a1a3b8246a1a514e7 (diff)
core: implement /run/elogind/units/-based path for passing unit info from PID 1 to journald
And let's make use of it to implement two new unit settings with it: 1. LogLevelMax= is a new per-unit setting that may be used to configure log priority filtering: set it to LogLevelMax=notice and only messages of level "notice" and lower (i.e. more important) will be processed, all others are dropped. 2. LogExtraFields= is a new per-unit setting for configuring per-unit journal fields, that are implicitly included in every log record generated by the unit's processes. It takes field/value pairs in the form of FOO=BAR. Also, related to this, one exisiting unit setting is ported to this new facility: 3. The invocation ID is now pulled from /run/elogind/units/ instead of cgroupfs xattrs. This substantially relaxes requirements of elogind on the kernel version and the privileges it runs with (specifically, cgroupfs xattrs are not available in containers, since they are stored in kernel memory, and hence are unsafe to permit to lesser privileged code). /run/elogind/units/ is a new directory, which contains a number of files and symlinks encoding the above information. PID 1 creates and manages these files, and journald reads them from there. Note that this is supposed to be a direct path between PID 1 and the journal only, due to the special runtime environment the journal runs in. Normally, today we shouldn't introduce new interfaces that (mis-)use a file system as IPC framework, and instead just an IPC system, but this is very hard to do between the journal and PID 1, as long as the IPC system is a subject PID 1 manages, and itself a client to the journal. This patch cleans up a couple of types used in journal code: specifically we switch to size_t for a couple of memory-sizing values, as size_t is the right choice for everything that is memory. Fixes: #4089 Fixes: #3041 Fixes: #4441
Diffstat (limited to 'src')
-rw-r--r--src/basic/log.c6
-rw-r--r--src/basic/log.h4
-rw-r--r--src/shared/conf-parser.c8
3 files changed, 10 insertions, 8 deletions
diff --git a/src/basic/log.c b/src/basic/log.c
index 04d85e7ea..3367f8424 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -863,8 +863,8 @@ int log_oom_internal(LogRealm realm, const char *file, int line, const char *fun
int log_format_iovec(
struct iovec *iovec,
- unsigned iovec_len,
- unsigned *n,
+ size_t iovec_len,
+ size_t *n,
bool newline_separator,
int error,
const char *format,
@@ -945,7 +945,7 @@ int log_struct_internal(
if (journal_fd >= 0) {
char header[LINE_MAX];
struct iovec iovec[17] = {};
- unsigned n = 0, i;
+ size_t n = 0, i;
int r;
struct msghdr mh = {
.msg_iov = iovec,
diff --git a/src/basic/log.h b/src/basic/log.h
index c4d089b19..7b67fd45b 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -182,8 +182,8 @@ int log_oom_internal(
int log_format_iovec(
struct iovec *iovec,
- unsigned iovec_len,
- unsigned *n,
+ size_t iovec_len,
+ size_t *n,
bool newline_separator,
int error,
const char *format,
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index b95cd0fd5..59fa4d81e 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -851,7 +851,6 @@ int config_parse_log_facility(
void *data,
void *userdata) {
-
int *o = data, x;
assert(filename);
@@ -883,7 +882,6 @@ int config_parse_log_level(
void *data,
void *userdata) {
-
int *o = data, x;
assert(filename);
@@ -897,7 +895,11 @@ int config_parse_log_level(
return 0;
}
- *o = (*o & LOG_FACMASK) | x;
+ if (*o < 0) /* if it wasn't initialized so far, assume zero facility */
+ *o = x;
+ else
+ *o = (*o & LOG_FACMASK) | x;
+
return 0;
}