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

stdout-bridge: rename logger to stdout-syslog-bridge to make it more descriptive

This commit is contained in:
Lennart Poettering 2011-08-30 22:42:49 +02:00
parent af65c24804
commit 346bce1f4c
15 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -58,7 +58,7 @@ systemd-initctl
systemd
test-engine
test-job-type
systemd-logger
systemd-stdout-syslog-bridge
systemctl
systemadm
.dirstamp

18
Makefile.am
View File

@ -150,7 +150,7 @@ bin_PROGRAMS += \
endif
rootlibexec_PROGRAMS = \
systemd-logger \
systemd-stdout-syslog-bridge \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
@ -354,7 +354,7 @@ dist_systemunit_DATA = \
units/sockets.target \
units/swap.target \
units/systemd-initctl.socket \
units/systemd-logger.socket \
units/systemd-stdout-syslog-bridge.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
units/dev-hugepages.automount \
@ -395,7 +395,7 @@ nodist_systemunit_DATA = \
units/serial-getty@.service \
units/console-shell.service \
units/systemd-initctl.service \
units/systemd-logger.service \
units/systemd-stdout-syslog-bridge.service \
units/systemd-shutdownd.service \
units/systemd-logind.service \
units/systemd-kmsg-syslogd.service \
@ -458,7 +458,7 @@ EXTRA_DIST = \
units/console-shell.service.m4 \
units/rescue.service.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-stdout-syslog-bridge.service.in \
units/systemd-shutdownd.service.in \
units/systemd-logind.service.in \
units/systemd-kmsg-syslogd.service.in \
@ -946,11 +946,11 @@ test_install_CFLAGS = \
test_install_LDADD = \
libsystemd-basic.la
systemd_logger_SOURCES = \
src/logger.c \
systemd_stdout_syslog_bridge_SOURCES = \
src/stdout-syslog-bridge.c \
src/tcpwrap.c
systemd_logger_LDADD = \
systemd_stdout_syslog_bridge_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(LIBWRAP_LIBS)
@ -1766,8 +1766,8 @@ endif
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
$(LN_S) ../syslog.socket syslog.socket )

2
TODO
View File

@ -39,8 +39,6 @@ Features:
* allow Type=simple with PIDFile=
https://bugzilla.redhat.com/show_bug.cgi?id=723942
* rename systemd-logger to systemd-stdio-syslog-bridge
* file bugs against sysklogd, syslog-ng because of StandardOuput=null
* turn default stdout/stderr to syslog (after rsyslog got updated)

2
man/daemon.xml
View File

@ -323,7 +323,7 @@
<listitem><para>Instead of using the
<function>syslog()</function> call to log directly to the
system logger, a new-style daemon may
system syslog service, a new-style daemon may
choose to simply log to STDERR via
<function>fprintf()</function>, which is then forwarded to
syslog by the init system. If log

3
man/systemd.exec.xml
View File

@ -383,7 +383,8 @@
terminal. <option>syslog</option>
connects standard output to the
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
system logger. <option>kmsg</option>
system syslog
service. <option>kmsg</option>
connects it with the kernel log buffer
which is accessible via
<citerefentry><refentrytitle>dmesg</refentrytitle><manvolnum>1</manvolnum></citerefentry>. <option>syslog+console</option>

12
man/systemd.special.xml.in
View File

@ -80,8 +80,8 @@
<filename>syslog.target</filename>,
<filename>systemd-initctl.service</filename>,
<filename>systemd-initctl.socket</filename>,
<filename>systemd-logger.service</filename>,
<filename>systemd-logger.socket</filename>,
<filename>systemd-stdout-syslog-bridge.service</filename>,
<filename>systemd-stdout-syslog-bridge.socket</filename>,
<filename>time-sync.target</filename>,
<filename>umount.target</filename></para>
</refsynopsisdiv>
@ -563,7 +563,7 @@
</listitem>
</varlistentry>
<varlistentry>
<term><filename>systemd-logger.service</filename></term>
<term><filename>systemd-stdout-syslog-bridge.service</filename></term>
<listitem>
<para>This is internally used
by systemd to provide syslog
@ -571,15 +571,15 @@
maintains.</para>
<para>This is a
socket-activated service, see
<filename>system-logger.socket</filename>.</para>
<filename>system-stdout-syslog-bridge.socket</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>systemd-logger.socket</filename></term>
<term><filename>systemd-stdout-syslog-bridge.socket</filename></term>
<listitem>
<para>Socket activation unit
for
<filename>system-logger.service</filename>. systemd
<filename>system-stdout-syslog-bridge.service</filename>. systemd
will automatically add
dependencies of types Requires
and After to all units that

4
man/systemd.xml
View File

@ -1074,10 +1074,10 @@
</varlistentry>
<varlistentry>
<term><filename>/run/systemd/logger</filename></term>
<term><filename>/run/systemd/stdout-syslog-bridge</filename></term>
<listitem><para>Used internally by the
<filename>systemd-logger.service</filename>
<filename>systemd-stdout-syslog-bridge.service</filename>
unit to connect STDOUT and/or STDERR
of spawned processes to
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>

4
src/execute.c
View File

@ -188,9 +188,9 @@ static int connect_logger_as(const ExecContext *context, ExecOutput output, cons
zero(sa);
sa.sa.sa_family = AF_UNIX;
strncpy(sa.un.sun_path, LOGGER_SOCKET, sizeof(sa.un.sun_path));
strncpy(sa.un.sun_path, STDOUT_SYSLOG_BRIDGE_SOCKET, sizeof(sa.un.sun_path));
if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(LOGGER_SOCKET) - 1) < 0) {
if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(STDOUT_SYSLOG_BRIDGE_SOCKET) - 1) < 0) {
close_nointr_nofail(fd);
return -errno;
}

2
src/execute.h
View File

@ -40,7 +40,7 @@ struct CGroupAttribute;
#include "list.h"
#include "util.h"
#define LOGGER_SOCKET "/run/systemd/logger"
#define STDOUT_SYSLOG_BRIDGE_SOCKET "/run/systemd/stdout-syslog-bridge"
typedef enum KillMode {
KILL_CONTROL_GROUP = 0,

2
src/special.h
View File

@ -68,7 +68,7 @@
/* Services systemd relies on */
#define SPECIAL_DBUS_SERVICE "dbus.service"
#define SPECIAL_DBUS_SOCKET "dbus.socket"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
#define SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET "systemd-stdout-syslog-bridge.socket"
#define SPECIAL_SYSLOG_SOCKET "syslog.socket"
/* Magic init signals */

6
src/logger.c → src/stdout-syslog-bridge.c
View File

@ -409,7 +409,7 @@ static int stream_new(Server *s, int server_fd) {
return 0;
}
if (!socket_tcpwrap(fd, "systemd-logger")) {
if (!socket_tcpwrap(fd, "systemd-stdout-syslog-bridge")) {
close_nointr_nofail(fd);
return 0;
}
@ -652,7 +652,7 @@ int main(int argc, char *argv[]) {
if (server_init(&server, (unsigned) n) < 0)
return EXIT_FAILURE;
log_debug("systemd-logger running as pid %lu", (unsigned long) getpid());
log_debug("systemd-stdout-syslog-bridge running as pid %lu", (unsigned long) getpid());
sd_notify(false,
"READY=1\n"
@ -682,7 +682,7 @@ int main(int argc, char *argv[]) {
r = EXIT_SUCCESS;
log_debug("systemd-logger stopped as pid %lu", (unsigned long) getpid());
log_debug("systemd-stdout-syslog-bridge stopped as pid %lu", (unsigned long) getpid());
fail:
sd_notify(false,

2
src/unit.c
View File

@ -573,7 +573,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
* logging daemon is run first. */
if (u->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0)
if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET, NULL, true)) < 0)
return r;
return 0;

2
units/.gitignore vendored
View File

@ -33,7 +33,7 @@ systemd-shutdownd.service
systemd-random-seed-load.service
systemd-random-seed-save.service
systemd-initctl.service
systemd-logger.service
systemd-stdout-syslog-bridge.service
getty@.service
systemd-update-utmp-runlevel.service
systemd-update-utmp-shutdown.service

4
units/systemd-logger.service.in → units/systemd-stdout-syslog-bridge.service.in
View File

@ -8,13 +8,13 @@
# See systemd.special(7) for details
[Unit]
Description=Stdio Syslog Bridge
Description=STDOUT Syslog Bridge
DefaultDependencies=no
Requires=syslog.socket
After=syslog.socket
[Service]
ExecStart=@rootlibexecdir@/systemd-logger
ExecStart=@rootlibexecdir@/systemd-stdout-syslog-bridge
NotifyAccess=all
StandardOutput=null
CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID

2
units/systemd-logger.socket → units/systemd-stdout-syslog-bridge.socket
View File

@ -18,4 +18,4 @@ Before=sockets.target
IgnoreOnIsolate=yes
[Socket]
ListenStream=/run/systemd/logger
ListenStream=/run/systemd/stdout-syslog-bridge