shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 10:25:37 +03:00
Code

journal: move sockets into their own subdir

Browse Source
This commit is contained in:
Lennart Poettering 2012-01-05 20:24:16 +01:00
parent 55d7bfc19b
commit 259d2e7620
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal/journal-send.c
View File

@ -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) {

10
src/journal/journald.c
View File

@ -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.");

2
units/syslog.socket
View File

@ -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

4
units/systemd-journald.socket
View File

@ -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