diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
| commit | 0f52727043736b1e411bc60309ed18d41a4f1234 (patch) | |
| tree | 97fd6c1defe93abc97717c4ae3d598166f7ad402 /runtime/errmsg.c | |
| parent | 7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0 (diff) | |
| parent | 4a24d8e1b63a27d8c20f2d3d614fcdc2bcb52a01 (diff) | |
| download | rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.gz rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.bz2 rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.zip | |
Merge branch 'beta' into v6-stable
Diffstat (limited to 'runtime/errmsg.c')
| -rw-r--r-- | runtime/errmsg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/errmsg.c b/runtime/errmsg.c index 09246944..dcb5b185 100644 --- a/runtime/errmsg.c +++ b/runtime/errmsg.c @@ -36,7 +36,6 @@ #include "rsyslog.h" #include "obj.h" #include "errmsg.h" -#include "sysvar.h" #include "srUtils.h" #include "stringbuf.h" @@ -84,13 +83,13 @@ LogError(int iErrno, int iErrCode, char *fmt, ... ) if(iErrno != 0) { rs_strerror_r(iErrno, errStr, sizeof(errStr)); - if(iErrCode == NO_ERRCODE) { + if(iErrCode == NO_ERRCODE || iErrCode == RS_RET_ERR) { snprintf(msg, sizeof(msg), "%s: %s", buf, errStr); } else { snprintf(msg, sizeof(msg), "%s: %s [try http://www.rsyslog.com/e/%d ]", buf, errStr, iErrCode * -1); } } else { - if(iErrCode == NO_ERRCODE) { + if(iErrCode == NO_ERRCODE || iErrCode == RS_RET_ERR) { snprintf(msg, sizeof(msg), "%s", buf); } else { snprintf(msg, sizeof(msg), "%s [try http://www.rsyslog.com/e/%d ]", buf, iErrCode * -1); |