chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: fix auto restarting of units after a configuration reload
[elogind.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index 4f9f2da2592c5a99ad96eec34ba5d7b927afbbcb..28bfb9a1e133bf63d3c5d8039b9ac155d4cff4e6 100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-227,10
+227,10
@@
static int write_to_console(
if (show_location)
IOVEC_SET_STRING(iovec[n++], location);
if (highlight)
if (show_location)
IOVEC_SET_STRING(iovec[n++], location);
if (highlight)
- IOVEC_SET_STRING(iovec[n++],
"\x1B[1;31m"
);
+ IOVEC_SET_STRING(iovec[n++],
ANSI_HIGHLIGHT_ON
);
IOVEC_SET_STRING(iovec[n++], buffer);
if (highlight)
IOVEC_SET_STRING(iovec[n++], buffer);
if (highlight)
- IOVEC_SET_STRING(iovec[n++],
"\x1B[0m"
);
+ IOVEC_SET_STRING(iovec[n++],
ANSI_HIGHLIGHT_OFF
);
IOVEC_SET_STRING(iovec[n++], "\n");
if (writev(console_fd, iovec, n) < 0)
IOVEC_SET_STRING(iovec[n++], "\n");
if (writev(console_fd, iovec, n) < 0)
@@
-265,7
+265,7
@@
static int write_to_syslog(
if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
return -EINVAL;
if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
return -EINVAL;
- snprintf(header_pid, sizeof(header_pid), "[%l
lu]: ", (unsigned long
long) getpid());
+ snprintf(header_pid, sizeof(header_pid), "[%l
u]: ", (unsigned
long) getpid());
char_array_0(header_pid);
zero(iovec);
char_array_0(header_pid);
zero(iovec);
@@
-279,7
+279,7
@@
static int write_to_syslog(
msghdr.msg_iov = iovec;
msghdr.msg_iovlen = ELEMENTSOF(iovec);
msghdr.msg_iov = iovec;
msghdr.msg_iovlen = ELEMENTSOF(iovec);
- if (sendmsg(syslog_fd, &msghdr,
0
) < 0)
+ if (sendmsg(syslog_fd, &msghdr,
MSG_NOSIGNAL
) < 0)
return -errno;
return 1;
return -errno;
return 1;
@@
-301,7
+301,7
@@
static int write_to_kmsg(
snprintf(header_priority, sizeof(header_priority), "<%i>", LOG_PRI(level));
char_array_0(header_priority);
snprintf(header_priority, sizeof(header_priority), "<%i>", LOG_PRI(level));
char_array_0(header_priority);
- snprintf(header_pid, sizeof(header_pid), "[%l
lu]: ", (unsigned long
long) getpid());
+ snprintf(header_pid, sizeof(header_pid), "[%l
u]: ", (unsigned
long) getpid());
char_array_0(header_pid);
zero(iovec);
char_array_0(header_pid);
zero(iovec);
@@
-474,11
+474,11
@@
void log_parse_environment(void) {
if (log_set_max_level_from_string(e) < 0)
log_warning("Failed to parse log level %s. Ignoring.", e);
if (log_set_max_level_from_string(e) < 0)
log_warning("Failed to parse log level %s. Ignoring.", e);
- if ((e = getenv("SYSTEMD_
SHOW
_COLOR")))
+ if ((e = getenv("SYSTEMD_
LOG
_COLOR")))
if (log_show_color_from_string(e) < 0)
log_warning("Failed to parse bool %s. Ignoring.", e);
if (log_show_color_from_string(e) < 0)
log_warning("Failed to parse bool %s. Ignoring.", e);
- if ((e = getenv("SYSTEMD_
SHOW
_LOCATION"))) {
+ if ((e = getenv("SYSTEMD_
LOG
_LOCATION"))) {
if (log_show_location_from_string(e) < 0)
log_warning("Failed to parse bool %s. Ignoring.", e);
}
if (log_show_location_from_string(e) < 0)
log_warning("Failed to parse bool %s. Ignoring.", e);
}