d025f1e4dc
The point is to allow the use of journald functions by other binaries. Before, journald code was split into multiple files (journald-*.[ch]), but all those files all required functions from journald.c. And journald.c has its own main(). Now, it is possible to link against those functions, e.g. from test binaries. This constitutes a fix for https://bugzilla.redhat.com/show_bug.cgi?id=872638. The patch does the following: 1. rename journald.h to journald-server.h and move corresponding code to journald-server.c. 2. add journald-server.c and other journald-*.c parts to libsystemd-journal-internal. 3. remove journald-syslog.c from test_journal_syslog_SOURCES, since it is now contained in libsystemd-journal-internal. There are no code changes, apart from the removal of a few static's, to allow function calls between files.
87 lines
2.6 KiB
C
87 lines
2.6 KiB
C
/*-*- 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 <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include "journald-server.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);
|
|
}
|