From 3b7124a8db56ed57525b9ecfd19cfdc8c9facba0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 22 Aug 2012 03:36:29 +0200 Subject: [PATCH] journald: split console transport stuff into its own file --- Makefile.am | 2 + src/journal/journald-console.c | 85 ++++++++++++++++++++++++++++++++++ src/journal/journald-console.h | 26 +++++++++++ src/journal/journald-stream.c | 1 + src/journal/journald-syslog.c | 1 + src/journal/journald.c | 56 +--------------------- src/journal/journald.h | 3 -- 7 files changed, 116 insertions(+), 58 deletions(-) create mode 100644 src/journal/journald-console.c create mode 100644 src/journal/journald-console.h diff --git a/Makefile.am b/Makefile.am index a72da90260..dfcb960b07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2315,6 +2315,8 @@ systemd_journald_SOURCES = \ src/journal/journald-syslog.h \ src/journal/journald-stream.c \ src/journal/journald-stream.h \ + src/journal/journald-console.c \ + src/journal/journald-console.h \ src/journal/journal-rate-limit.c \ src/journal/journal-rate-limit.h \ src/journal/journal-internal.h diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c new file mode 100644 index 0000000000..6cd2397ac3 --- /dev/null +++ b/src/journal/journald-console.c @@ -0,0 +1,85 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2011 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include + +#include "journald.h" +#include "journald-console.h" + +void server_forward_console( + Server *s, + int priority, + const char *identifier, + const char *message, + struct ucred *ucred) { + + struct iovec iovec[4]; + char header_pid[16]; + int n = 0, fd; + char *ident_buf = NULL; + const char *tty; + + assert(s); + assert(message); + + if (LOG_PRI(priority) > s->max_level_console) + return; + + /* First: identifier and PID */ + if (ucred) { + if (!identifier) { + get_process_comm(ucred->pid, &ident_buf); + identifier = ident_buf; + } + + snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid); + char_array_0(header_pid); + + if (identifier) + IOVEC_SET_STRING(iovec[n++], identifier); + + IOVEC_SET_STRING(iovec[n++], header_pid); + } else if (identifier) { + IOVEC_SET_STRING(iovec[n++], identifier); + IOVEC_SET_STRING(iovec[n++], ": "); + } + + /* Third: message */ + IOVEC_SET_STRING(iovec[n++], message); + IOVEC_SET_STRING(iovec[n++], "\n"); + + tty = s->tty_path ? s->tty_path : "/dev/console"; + + fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC); + if (fd < 0) { + log_debug("Failed to open %s for logging: %s", tty, strerror(errno)); + goto finish; + } + + if (writev(fd, iovec, n) < 0) + log_debug("Failed to write to %s for logging: %s", tty, strerror(errno)); + + close_nointr_nofail(fd); + +finish: + free(ident_buf); +} diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h new file mode 100644 index 0000000000..068cc5b86b --- /dev/null +++ b/src/journal/journald-console.h @@ -0,0 +1,26 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2011 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include "journald.h" + +void server_forward_console(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred); diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 98fdf781bf..3e4022ad69 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -32,6 +32,7 @@ #include "journald-stream.h" #include "journald-syslog.h" #include "journald-kmsg.h" +#include "journald-console.h" #define STDOUT_STREAMS_MAX 4096 diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 12c5b2849c..daed095c29 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -26,6 +26,7 @@ #include "journald.h" #include "journald-syslog.h" #include "journald-kmsg.h" +#include "journald-console.h" static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, struct ucred *ucred, struct timeval *tv) { struct msghdr msghdr; diff --git a/src/journal/journald.c b/src/journal/journald.c index cce11f73dc..5836119bed 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -57,6 +57,7 @@ #include "journald-kmsg.h" #include "journald-syslog.h" #include "journald-stream.h" +#include "journald-console.h" #ifdef HAVE_ACL #include @@ -772,61 +773,6 @@ finish: dispatch_message_real(s, iovec, n, m, ucred, tv, label, label_len, unit_id); } -void server_forward_console(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred) { - struct iovec iovec[4]; - char header_pid[16]; - int n = 0, fd; - char *ident_buf = NULL; - const char *tty; - - assert(s); - assert(message); - - if (LOG_PRI(priority) > s->max_level_console) - return; - - /* First: identifier and PID */ - if (ucred) { - if (!identifier) { - get_process_comm(ucred->pid, &ident_buf); - identifier = ident_buf; - } - - snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid); - char_array_0(header_pid); - - if (identifier) - IOVEC_SET_STRING(iovec[n++], identifier); - - IOVEC_SET_STRING(iovec[n++], header_pid); - } else if (identifier) { - IOVEC_SET_STRING(iovec[n++], identifier); - IOVEC_SET_STRING(iovec[n++], ": "); - } - - /* Third: message */ - IOVEC_SET_STRING(iovec[n++], message); - IOVEC_SET_STRING(iovec[n++], "\n"); - - tty = s->tty_path ? s->tty_path : "/dev/console"; - - fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC); - if (fd < 0) { - log_debug("Failed to open %s for logging: %s", tty, strerror(errno)); - goto finish; - } - - if (writev(fd, iovec, n) < 0) - log_debug("Failed to write to %s for logging: %s", tty, strerror(errno)); - - close_nointr_nofail(fd); - -finish: - free(ident_buf); -} - - - static bool valid_user_field(const char *p, size_t l) { const char *a; diff --git a/src/journal/journald.h b/src/journal/journald.h index c292116448..e3a06d3cae 100644 --- a/src/journal/journald.h +++ b/src/journal/journald.h @@ -108,7 +108,6 @@ typedef struct Server { #define N_IOVEC_UDEV_FIELDS 32 void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, struct ucred *ucred, struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority); - void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...); /* gperf lookup function */ @@ -118,5 +117,3 @@ int config_parse_storage(const char *filename, unsigned line, const char *sectio const char *storage_to_string(Storage s); Storage storage_from_string(const char *s); - -void server_forward_console(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred);