diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:05:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-02 12:05:59 +0100 |
| commit | 14d415e4a84e2c08df1b23a86959f0d9b0006687 (patch) | |
| tree | a972c997592716dc30b33f323ab80a08575ada29 /plugins | |
| parent | 249828deebd877693298a504ca1637e6b30c5564 (diff) | |
| parent | 536c9370f0773d25ee7a85aa44a10d07bc5e1420 (diff) | |
| download | rsyslog-14d415e4a84e2c08df1b23a86959f0d9b0006687.tar.gz rsyslog-14d415e4a84e2c08df1b23a86959f0d9b0006687.tar.xz rsyslog-14d415e4a84e2c08df1b23a86959f0d9b0006687.zip | |
Merge branch 'v5-stable' into v5-devel
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 27597b78..29c9c949 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -68,8 +68,11 @@ MODULE_TYPE_NOKEEP #define _PATH_LOG "/dev/log" #endif #endif +#ifndef SYSTEMD_JOURNAL +#define SYSTEMD_JOURNAL "/run/systemd/journal" +#endif #ifndef SYSTEMD_PATH_LOG -#define SYSTEMD_PATH_LOG "/run/systemd/journal/syslog" +#define SYSTEMD_PATH_LOG SYSTEMD_JOURNAL "/syslog" #endif /* emulate struct ucred for platforms that do not have it */ @@ -963,7 +966,7 @@ CODESTARTwillRun listeners[0].sockName = pLogSockName; else if(sd_booted()) { struct stat st; - if(stat(SYSTEMD_PATH_LOG, &st) != -1 && S_ISSOCK(st.st_mode)) { + if(stat(SYSTEMD_JOURNAL, &st) != -1 && S_ISDIR(st.st_mode)) { listeners[0].sockName = SYSTEMD_PATH_LOG; } } |