chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86b9b8e
)
journal: rename priority_prefix to level_prefix, since that's how we call it in PID 1
author
Lennart Poettering
<lennart@poettering.net>
Thu, 5 Jan 2012 20:39:59 +0000
(21:39 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 5 Jan 2012 20:39:59 +0000
(21:39 +0100)
src/journal/journald.c
patch
|
blob
|
history
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 22ac7d9a6ebe4ada8c036a9b21e8854b611548ae..419ce26ada78491d47b9fb17e7dd0136f96042a4 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-65,7
+65,7
@@
typedef enum StdoutStreamState {
STDOUT_STREAM_TAG,
STDOUT_STREAM_PRIORITY,
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,
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;
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;
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;
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)
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;
}
return -EINVAL;
}
- s->state = STDOUT_STREAM_
PRIORITY
_PREFIX;
+ s->state = STDOUT_STREAM_
LEVEL
_PREFIX;
return 0;
return 0;
- case STDOUT_STREAM_
PRIORITY
_PREFIX:
+ case STDOUT_STREAM_
LEVEL
_PREFIX:
r = parse_boolean(p);
if (r < 0) {
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;
}
return -EINVAL;
}
- s->
priority
_prefix = !!r;
+ s->
level
_prefix = !!r;
s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
return 0;
s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
return 0;