diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:44:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:44:12 +0200 |
| commit | d53016962da179c52ad22600bd54ffd58f86a81c (patch) | |
| tree | f557da4c02f73f13df76347078d7bc2388fdd89d /runtime/errmsg.c | |
| parent | cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.gz rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.xz rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/errmsg.c')
| -rw-r--r-- | runtime/errmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/errmsg.c b/runtime/errmsg.c index 09246944..e3555c1f 100644 --- a/runtime/errmsg.c +++ b/runtime/errmsg.c @@ -84,13 +84,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); |