picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: rename priority_prefix to level_prefix, since that's how we call it in PID 1

Browse source
This commit is contained in:
Lennart Poettering 2012-01-05 21:39:59 +01:00
parent 86b9b8e70d
commit 258cdffc2f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/journal/journald.c
View file

@ -65,7 +65,7 @@
typedef enum StdoutStreamState {
STDOUT_STREAM_TAG,
STDOUT_STREAM_PRIORITY,
STDOUT_STREAM_PRIORITY_PREFIX,
STDOUT_STREAM_LEVEL_PREFIX,
STDOUT_STREAM_FORWARD_TO_SYSLOG,
STDOUT_STREAM_FORWARD_TO_KMSG,
STDOUT_STREAM_FORWARD_TO_CONSOLE,
@ -82,7 +82,7 @@ struct StdoutStream {
char *tag;
int priority;
bool priority_prefix:1;
bool level_prefix:1;
bool forward_to_syslog:1;
bool forward_to_kmsg:1;
bool forward_to_console:1;
@ -1235,7 +1235,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
priority = s->priority;
if (s->priority_prefix)
if (s->level_prefix)
parse_syslog_priority((char**) &p, &priority);
if (s->forward_to_syslog || s->server->forward_to_syslog)
@ -1303,17 +1303,17 @@ static int stdout_stream_line(StdoutStream *s, char *p) {
return -EINVAL;
}
s->state = STDOUT_STREAM_PRIORITY_PREFIX;
s->state = STDOUT_STREAM_LEVEL_PREFIX;
return 0;
case STDOUT_STREAM_PRIORITY_PREFIX:
case STDOUT_STREAM_LEVEL_PREFIX:
r = parse_boolean(p);
if (r < 0) {
log_warning("Failed to parse priority prefix line.");
log_warning("Failed to parse level prefix line.");
return -EINVAL;
}
s->priority_prefix = !!r;
s->level_prefix = !!r;
s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
return 0;