summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-05 20:24:16 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-05 20:24:16 +0100
commit259d2e762041d8d50c2a17bfea90b1a96f6b880b (patch)
treefbf7fe43799a0ec584a530e044dd1faf781e1132 /src/journal
parent55d7bfc19b72eca09d2bb7c9c73a62c886d8b9b4 (diff)
journal: move sockets into their own subdir
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journal-send.c4
-rw-r--r--src/journal/journald.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index e7e3fa2cd0..176aac2792 100644
--- 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 d7f0ed52b4..e0dfb35920 100644
--- 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.");