chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
notify: add systemd-notify command line tool
[elogind.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index bf2382dfafe0bb4407488f6d24d8b00ffdb8f724..b7173eb550bf080d14d9b7c275fe80142ff9ff32 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-162,6
+162,12
@@
int log_open(void) {
* the fs. If we don't use /dev/kmsg we still keep it open,
* because there is no reason to close it. */
* the fs. If we don't use /dev/kmsg we still keep it open,
* because there is no reason to close it. */
+ if (log_target == LOG_TARGET_NULL) {
+ log_close_syslog();
+ log_close_console();
+ return 0;
+ }
+
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG)
if ((r = log_open_syslog()) >= 0) {
if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
log_target == LOG_TARGET_SYSLOG)
if ((r = log_open_syslog()) >= 0) {
@@
-261,7
+267,7
@@
static int write_to_syslog(
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], header_time);
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
IOVEC_SET_STRING(iovec[1], header_time);
- IOVEC_SET_STRING(iovec[2],
__prog
name);
+ IOVEC_SET_STRING(iovec[2],
program_invocation_short_
name);
IOVEC_SET_STRING(iovec[3], header_pid);
IOVEC_SET_STRING(iovec[4], buffer);
IOVEC_SET_STRING(iovec[3], header_pid);
IOVEC_SET_STRING(iovec[4], buffer);
@@
-296,7
+302,7
@@
static int write_to_kmsg(
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
zero(iovec);
IOVEC_SET_STRING(iovec[0], header_priority);
- IOVEC_SET_STRING(iovec[1],
__prog
name);
+ IOVEC_SET_STRING(iovec[1],
program_invocation_short_
name);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], buffer);
IOVEC_SET_STRING(iovec[4], "\n");
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], buffer);
IOVEC_SET_STRING(iovec[4], "\n");
@@
-316,6
+322,9
@@
static int log_dispatch(
int r = 0;
int r = 0;
+ if (log_target == LOG_TARGET_NULL)
+ return 0;
+
do {
char *e;
int k;
do {
char *e;
int k;
@@
-475,6
+484,7
@@
static const char *const log_target_table[] = {
[LOG_TARGET_SYSLOG] = "syslog",
[LOG_TARGET_KMSG] = "kmsg",
[LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg",
[LOG_TARGET_SYSLOG] = "syslog",
[LOG_TARGET_KMSG] = "kmsg",
[LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg",
+ [LOG_TARGET_NULL] = "null"
};
DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);
};
DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);