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

Merge pull request #17911 from yuwata/log-cli-program-use-journal 

log: open journal when cli program run in a service unit
This commit is contained in:
Luca Boccassi 2020-12-09 14:30:32 +00:00 committed by GitHub
parent 141d3a14d4 13ee939784
commit 0727a75a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/basic/log.c
View File

@ -51,7 +51,7 @@ static int journal_fd = -1;
static bool syslog_is_stream = false; static bool syslog_is_stream = false;
static bool show_color = false; static int show_color = -1; /* tristate */
static bool show_location = false; static bool show_location = false;
static bool show_time = false; static bool show_time = false;
static bool show_tid = false; static bool show_tid = false;
@ -387,11 +387,10 @@ static int write_to_console(
iovec[n++] = IOVEC_MAKE_STRING(prefix); iovec[n++] = IOVEC_MAKE_STRING(prefix);
} }
if (show_time) { if (show_time &&
if (format_timestamp(header_time, sizeof(header_time), now(CLOCK_REALTIME))) { format_timestamp(header_time, sizeof(header_time), now(CLOCK_REALTIME))) {
iovec[n++] = IOVEC_MAKE_STRING(header_time); iovec[n++] = IOVEC_MAKE_STRING(header_time);
iovec[n++] = IOVEC_MAKE_STRING(" "); iovec[n++] = IOVEC_MAKE_STRING(" ");
}
} }
if (show_tid) { if (show_tid) {
@ -399,12 +398,12 @@ static int write_to_console(
iovec[n++] = IOVEC_MAKE_STRING(tid_string); iovec[n++] = IOVEC_MAKE_STRING(tid_string);
} }
if (show_color) if (log_get_show_color())
get_log_colors(LOG_PRI(level), &on, &off, NULL); get_log_colors(LOG_PRI(level), &on, &off, NULL);
if (show_location) { if (show_location) {
const char *lon = "", *loff = ""; const char *lon = "", *loff = "";
if (show_color) { if (log_get_show_color()) {
lon = ANSI_HIGHLIGHT_YELLOW4; lon = ANSI_HIGHLIGHT_YELLOW4;
loff = ANSI_NORMAL; loff = ANSI_NORMAL;
} }
@ -1222,7 +1221,7 @@ void log_show_color(bool b) {
} }
bool log_get_show_color(void) { bool log_get_show_color(void) {
return show_color; return show_color > 0; /* Defaults to false. */
} }
void log_show_location(bool b) { void log_show_location(bool b) {
@ -1485,7 +1484,9 @@ void log_setup_service(void) {
void log_setup_cli(void) { void log_setup_cli(void) {
/* Sets up logging the way it is most appropriate for running a program as a CLI utility. */ /* Sets up logging the way it is most appropriate for running a program as a CLI utility. */
log_show_color(true); log_set_target(LOG_TARGET_AUTO);
log_parse_environment_cli(); log_parse_environment_cli();
(void) log_open(); (void) log_open();
if (log_on_console() && show_color < 0)
log_show_color(true);
} }