From 346bce1f4cff0096177c613987cdc80fa4ec134e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Aug 2011 22:42:49 +0200 Subject: [PATCH] stdout-bridge: rename logger to stdout-syslog-bridge to make it more descriptive --- .gitignore | 2 +- Makefile.am | 18 +++++++++--------- TODO | 2 -- man/daemon.xml | 2 +- man/systemd.exec.xml | 3 ++- man/systemd.special.xml.in | 12 ++++++------ man/systemd.xml | 4 ++-- src/execute.c | 4 ++-- src/execute.h | 2 +- src/special.h | 2 +- src/{logger.c => stdout-syslog-bridge.c} | 6 +++--- src/unit.c | 2 +- units/.gitignore | 2 +- ...=> systemd-stdout-syslog-bridge.service.in} | 4 ++-- ...ket => systemd-stdout-syslog-bridge.socket} | 2 +- 15 files changed, 33 insertions(+), 34 deletions(-) rename src/{logger.c => stdout-syslog-bridge.c} (98%) rename units/{systemd-logger.service.in => systemd-stdout-syslog-bridge.service.in} (84%) rename units/{systemd-logger.socket => systemd-stdout-syslog-bridge.socket} (93%) diff --git a/.gitignore b/.gitignore index 6cfb3ed2..f4a8a45b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,7 @@ systemd-initctl systemd test-engine test-job-type -systemd-logger +systemd-stdout-syslog-bridge systemctl systemadm .dirstamp diff --git a/Makefile.am b/Makefile.am index 56446b01..b0c1d97e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 ) diff --git a/TODO b/TODO index 56d0a9df..6d562eab 100644 --- a/TODO +++ b/TODO @@ -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) diff --git a/man/daemon.xml b/man/daemon.xml index d5a84918..4673794f 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -323,7 +323,7 @@ Instead of using the syslog() 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 fprintf(), which is then forwarded to syslog by the init system. If log diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index bf32a89b..c7da8e31 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -383,7 +383,8 @@ terminal. connects standard output to the syslog3 - system logger. + system syslog + service. connects it with the kernel log buffer which is accessible via dmesg1. diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 1369b4b8..21875405 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -80,8 +80,8 @@ syslog.target, systemd-initctl.service, systemd-initctl.socket, - systemd-logger.service, - systemd-logger.socket, + systemd-stdout-syslog-bridge.service, + systemd-stdout-syslog-bridge.socket, time-sync.target, umount.target @@ -563,7 +563,7 @@ - systemd-logger.service + systemd-stdout-syslog-bridge.service This is internally used by systemd to provide syslog @@ -571,15 +571,15 @@ maintains. This is a socket-activated service, see - system-logger.socket. + system-stdout-syslog-bridge.socket. - systemd-logger.socket + systemd-stdout-syslog-bridge.socket Socket activation unit for - system-logger.service. systemd + system-stdout-syslog-bridge.service. systemd will automatically add dependencies of types Requires and After to all units that diff --git a/man/systemd.xml b/man/systemd.xml index fc481076..d66b2302 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1074,10 +1074,10 @@ - /run/systemd/logger + /run/systemd/stdout-syslog-bridge Used internally by the - systemd-logger.service + systemd-stdout-syslog-bridge.service unit to connect STDOUT and/or STDERR of spawned processes to syslog3 diff --git a/src/execute.c b/src/execute.c index 1ab32185..53e7e77f 100644 --- a/src/execute.c +++ b/src/execute.c @@ -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; } diff --git a/src/execute.h b/src/execute.h index d5fb61ba..77a2257e 100644 --- a/src/execute.h +++ b/src/execute.h @@ -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, diff --git a/src/special.h b/src/special.h index 08dae11a..614e53ca 100644 --- a/src/special.h +++ b/src/special.h @@ -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 */ diff --git a/src/logger.c b/src/stdout-syslog-bridge.c similarity index 98% rename from src/logger.c rename to src/stdout-syslog-bridge.c index 435d5a76..48a301f6 100644 --- a/src/logger.c +++ b/src/stdout-syslog-bridge.c @@ -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, diff --git a/src/unit.c b/src/unit.c index e0f4a1bb..031e6199 100644 --- a/src/unit.c +++ b/src/unit.c @@ -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; diff --git a/units/.gitignore b/units/.gitignore index ac700e80..cc92c730 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -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 diff --git a/units/systemd-logger.service.in b/units/systemd-stdout-syslog-bridge.service.in similarity index 84% rename from units/systemd-logger.service.in rename to units/systemd-stdout-syslog-bridge.service.in index 5f7fe409..23a51370 100644 --- a/units/systemd-logger.service.in +++ b/units/systemd-stdout-syslog-bridge.service.in @@ -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 diff --git a/units/systemd-logger.socket b/units/systemd-stdout-syslog-bridge.socket similarity index 93% rename from units/systemd-logger.socket rename to units/systemd-stdout-syslog-bridge.socket index 7178cc82..0706efd5 100644 --- a/units/systemd-logger.socket +++ b/units/systemd-stdout-syslog-bridge.socket @@ -18,4 +18,4 @@ Before=sockets.target IgnoreOnIsolate=yes [Socket] -ListenStream=/run/systemd/logger +ListenStream=/run/systemd/stdout-syslog-bridge -- 2.39.5