journal: move sockets into their own subdir

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index e7e3fa2cd07d39c8112374042d942ffcc9337837..176aac2792d4b77b0d49091e7ee76ce518aa7d26 100644 (file)
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -195,7 +195,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
 
         zero(sa);
         sa.sun_family = AF_UNIX;
-        strncpy(sa.sun_path,"/run/systemd/journal", sizeof(sa.sun_path));
+        strncpy(sa.sun_path,"/run/systemd/journal/socket", sizeof(sa.sun_path));
 
         zero(mh);
         mh.msg_name = &sa;
@@ -225,7 +225,7 @@ _public_ int sd_journal_stream_fd(const char *tag, int priority, int priority_pr
 
         zero(sa);
         sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/stdout", sizeof(sa.un.sun_path));
+        strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
 
         r = connect(fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
         if (r < 0) {

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d7f0ed52b4ac742ac10c52560e105c2feba905f1..e0dfb35920dface0901463a271601e61e7c5553a 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -680,7 +680,7 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned
 
         zero(sa);
         sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/syslog", sizeof(sa.un.sun_path));
+        strncpy(sa.un.sun_path, "/run/systemd/journal/syslog", sizeof(sa.un.sun_path));
         msghdr.msg_name = &sa;
         msghdr.msg_namelen = offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path);
 
@@ -1929,7 +1929,7 @@ static int open_native_socket(Server*s) {
 
                 zero(sa);
                 sa.un.sun_family = AF_UNIX;
-                strncpy(sa.un.sun_path, "/run/systemd/journal", sizeof(sa.un.sun_path));
+                strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
 
                 unlink(sa.un.sun_path);
 
@@ -1984,7 +1984,7 @@ static int open_stdout_socket(Server *s) {
 
                 zero(sa);
                 sa.un.sun_family = AF_UNIX;
-                strncpy(sa.un.sun_path, "/run/systemd/stdout", sizeof(sa.un.sun_path));
+                strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
 
                 unlink(sa.un.sun_path);
 
@@ -2106,7 +2106,7 @@ static int server_init(Server *s) {
 
         for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
 
-                if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/native", 0) > 0) {
+                if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/socket", 0) > 0) {
 
                         if (s->native_fd >= 0) {
                                 log_error("Too many native sockets passed.");
@@ -2115,7 +2115,7 @@ static int server_init(Server *s) {
 
                         s->native_fd = fd;
 
-                } else if (sd_is_socket_unix(fd, SOCK_STREAM, 1, "/run/systemd/stdout", 0) > 0) {
+                } else if (sd_is_socket_unix(fd, SOCK_STREAM, 1, "/run/systemd/journal/stdout", 0) > 0) {
 
                         if (s->stdout_fd >= 0) {
                                 log_error("Too many stdout sockets passed.");

diff --git a/units/syslog.socket b/units/syslog.socket
index ce07a6697ea7e1e6b5e0fe9c368551c837d89feb..2d42305ec2edbc79f183fde3503b3dd19a0f156e 100644 (file)
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -16,7 +16,7 @@ Before=sockets.target syslog.target
 Wants=syslog.target
 
 [Socket]
-ListenDatagram=/run/systemd/syslog
+ListenDatagram=/run/systemd/journal/syslog
 SocketMode=0666
 PassCredentials=yes
 

diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index ccb35b11a7ee0044f262caa03bae945c95770088..1062390fff7030f54e74442c62fa0f88a8210c59 100644 (file)
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -18,8 +18,8 @@ Before=sockets.target syslog.target
 IgnoreOnIsolate=yes
 
 [Socket]
-ListenStream=/run/systemd/stdout
-ListenDatagram=/run/systemd/native
+ListenStream=/run/systemd/journal/stdout
+ListenDatagram=/run/systemd/journal/socket
 ListenDatagram=/dev/log
 SocketMode=0666
 PassCredentials=yes