diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:56:56 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:56:56 +0100 |
| commit | d94ba2a5468089b657e0779ddd2f4585face37e3 (patch) | |
| tree | 7bd4885fbacb8e83be0bfce71bc5ff2d5ea8b9a3 /plugins/imuxsock/imuxsock.c | |
| parent | 0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (diff) | |
| parent | e6aaf19689791c668ea444a21e470e4db3244cb5 (diff) | |
| download | rsyslog-d94ba2a5468089b657e0779ddd2f4585face37e3.tar.gz rsyslog-d94ba2a5468089b657e0779ddd2f4585face37e3.tar.xz rsyslog-d94ba2a5468089b657e0779ddd2f4585face37e3.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 9eeaaf5d..69f95f6f 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -784,7 +784,7 @@ CODESTARTwillRun else if(sd_booted()) { struct stat st; if(stat(SYSTEMD_JOURNAL, &st) != -1 && S_ISDIR(st.st_mode)) { - listeners[0].sockName = SYSTEMD_PATH_LOG; + listeners[0].sockName = (uchar*) SYSTEMD_PATH_LOG; } } if(ratelimitIntervalSysSock > 0) { @@ -1010,10 +1010,13 @@ CODEmodInit_QueryRegCFSLineHdlr /* support statistics gathering */ CHKiRet(statsobj.Construct(&modStats)); CHKiRet(statsobj.SetName(modStats, UCHAR_CONSTANT("imuxsock"))); + STATSCOUNTER_INIT(ctrSubmit, mutCtrSubmit); CHKiRet(statsobj.AddCounter(modStats, UCHAR_CONSTANT("submitted"), ctrType_IntCtr, &ctrSubmit)); + STATSCOUNTER_INIT(ctrLostRatelimit, mutCtrLostRatelimit); CHKiRet(statsobj.AddCounter(modStats, UCHAR_CONSTANT("ratelimit.discarded"), ctrType_IntCtr, &ctrLostRatelimit)); + STATSCOUNTER_INIT(ctrNumRatelimiters, mutCtrNumRatelimiters); CHKiRet(statsobj.AddCounter(modStats, UCHAR_CONSTANT("ratelimit.numratelimiters"), ctrType_IntCtr, &ctrNumRatelimiters)); CHKiRet(statsobj.ConstructFinalize(modStats)); |