diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-15 14:27:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-15 14:27:51 +0100 |
| commit | bd0d7bc621ac78a43a964139242bf3f1983f05b9 (patch) | |
| tree | 28684230ddbfe35fa31daf31366bfeda9976d041 | |
| parent | c3cc001a4f6c5a10a00091cd9c3d6e90e1a765c4 (diff) | |
| parent | 1afd79df5f1da6ce6da8dd594bc4fb32796acb9b (diff) | |
| download | rsyslog-bd0d7bc621ac78a43a964139242bf3f1983f05b9.tar.gz rsyslog-bd0d7bc621ac78a43a964139242bf3f1983f05b9.tar.bz2 rsyslog-bd0d7bc621ac78a43a964139242bf3f1983f05b9.zip | |
Merge branch 'master' into master-optimized
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imklog/bsd.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -5,6 +5,8 @@ Version 7.3.6 [devel] 2012-12-?? - impstats: added ability to write stats records to local file and avoid going through the syslog log stream. syslog logging can now also be turned off (see doc for details). +- bugfix: imklog issued wrong facility in error messages + ...what could lead to problems in other parts of the code - fix compile problem in imklog - added capability to output thread-id-to-function debug info This is a useful debug aid, but nothing of concern for regular users. diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c index 0fbee491..9c2eebb2 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -172,7 +172,7 @@ klogWillRun(modConfData_t *pModConf) fklog = open((char*)GetPath(pModConf), O_RDONLY, 0); if (fklog < 0) { - imklogLogIntMsg(RS_RET_ERR_OPEN_KLOG, "imklog: cannot open kernel log(%s): %s.", + imklogLogIntMsg(LOG_ERR, "imklog: cannot open kernel log(%s): %s.", GetPath(pModConf), rs_strerror_r(errno, errmsg, sizeof(errmsg))); ABORT_FINALIZE(RS_RET_ERR_OPEN_KLOG); } |