diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-05 17:27:02 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-05 17:27:02 +0100 |
| commit | e5f728face744ee6cfe2924da251a428a16c63d8 (patch) | |
| tree | 5fba65f16677d5ac8d9d2691c477b0398a56c6b2 /plugins/imuxsock/imuxsock.c | |
| parent | 5c09faee34befd6c2fa117055928c810ccf86f91 (diff) | |
| parent | 2b03e46acfc52b2933f45ba6ba38a36522163fdf (diff) | |
| download | rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.tar.gz rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.tar.xz rsyslog-e5f728face744ee6cfe2924da251a428a16c63d8.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index feddb20c..4523798f 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -67,6 +67,12 @@ 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 SYSTEMD_JOURNAL "/syslog" +#endif /* emulate struct ucred for platforms that do not have it */ #ifndef HAVE_SCM_CREDENTIALS @@ -775,6 +781,12 @@ CODESTARTwillRun # endif if(pLogSockName != NULL) listeners[0].sockName = pLogSockName; + else if(sd_booted()) { + struct stat st; + if(stat(SYSTEMD_JOURNAL, &st) != -1 && S_ISDIR(st.st_mode)) { + listeners[0].sockName = SYSTEMD_PATH_LOG; + } + } if(ratelimitIntervalSysSock > 0) { if((listeners[0].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn, NULL)) == NULL) { /* in this case, we simply turn of rate-limiting */ |