diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/execute.c | 4 | ||||
| -rw-r--r-- | src/execute.h | 2 | ||||
| -rw-r--r-- | src/special.h | 2 | ||||
| -rw-r--r-- | src/stdout-syslog-bridge.c (renamed from src/logger.c) | 6 | ||||
| -rw-r--r-- | src/unit.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/execute.c b/src/execute.c index 1ab3218517..53e7e77fde 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 d5fb61ba26..77a2257e9b 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 08dae11a25..614e53ca1b 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 index 435d5a7620..48a301f6a7 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 e0f4a1bb31..031e61993d 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; |