diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 14:47:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 14:47:49 +0100 |
| commit | 0bdeeb3c540a0e8e2946119163f9c2a3e0de9cfd (patch) | |
| tree | 8bbf361a9e6214de25c7105fcb53f00776ce0232 /plugins/imuxsock/imuxsock.c | |
| parent | 5a7d961304df67207489d7246a465115907dd9d8 (diff) | |
| parent | e31e840d5d6bf823b7129132c5582f86d3693f6c (diff) | |
| download | rsyslog-0bdeeb3c540a0e8e2946119163f9c2a3e0de9cfd.tar.gz rsyslog-0bdeeb3c540a0e8e2946119163f9c2a3e0de9cfd.tar.xz rsyslog-0bdeeb3c540a0e8e2946119163f9c2a3e0de9cfd.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 101d140e..36e6a4d8 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -67,6 +67,9 @@ MODULE_TYPE_NOKEEP #define _PATH_LOG "/dev/log" #endif #endif +#ifndef SYSTEMD_PATH_LOG +#define SYSTEMD_PATH_LOG "/run/systemd/journal/syslog" +#endif /* emulate struct ucred for platforms that do not have it */ #ifndef HAVE_SCM_CREDENTIALS @@ -775,6 +778,12 @@ CODESTARTwillRun # endif if(pLogSockName != NULL) listeners[0].sockName = pLogSockName; + else if(sd_booted()) { + struct stat st; + if(stat(SYSTEMD_PATH_LOG, &st) != -1 && S_ISSOCK(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 */ |