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:
8630d37
)
log: print at to one target at max
author
Lennart Poettering
<lennart@poettering.net>
Tue, 17 Aug 2010 01:31:45 +0000
(
03:31
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 17 Aug 2010 01:31:45 +0000
(
03:31
+0200)
src/log.c
patch
|
blob
|
history
diff --git
a/src/log.c
b/src/log.c
index d6f4e3461310229c3fdcfb3c017e1b46a9b456b7..d0d98ddf753ac14bc97abc7708994e1cefd2c148 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-331,7
+331,7
@@
static int log_dispatch(
do {
char *e;
do {
char *e;
- int k;
+ int k
= 0
;
buffer += strspn(buffer, NEWLINE);
buffer += strspn(buffer, NEWLINE);
@@
-344,24
+344,26
@@
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) {
- if ((
r
= write_to_syslog(level, file, line, func, buffer)) < 0) {
+ if ((
k
= write_to_syslog(level, file, line, func, buffer)) < 0) {
log_close_syslog();
log_open_kmsg();
log_close_syslog();
log_open_kmsg();
- } else if (
r
> 0)
+ } else if (
k
> 0)
r++;
}
r++;
}
- if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
- log_target == LOG_TARGET_KMSG) {
+ if (k <= 0 &&
+ (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
+ log_target == LOG_TARGET_KMSG)) {
- if ((
r
= write_to_kmsg(level, file, line, func, buffer)) < 0) {
+ if ((
k
= write_to_kmsg(level, file, line, func, buffer)) < 0) {
log_close_kmsg();
log_open_console();
log_close_kmsg();
log_open_console();
- } else if (
r
> 0)
+ } else if (
k
> 0)
r++;
}
r++;
}
- if ((k = write_to_console(level, file, line, func, buffer)) < 0)
+ if (k <= 0 &&
+ (k = write_to_console(level, file, line, func, buffer)) < 0)
return k;
buffer = e;
return k;
buffer = e;