diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-23 14:51:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-23 14:51:34 +0200 |
| commit | 2eea95f626badb5a93ff7eca97cc68e5d2f3940a (patch) | |
| tree | c7467c2ace398cda5d39e0f6fbda07e38fdc8e5c /runtime/errmsg.c | |
| parent | 7d8ac48a4a214da917f7455f24b4c292c3e6d015 (diff) | |
| parent | 9b06a4c26422b0a8727e1b3c6cc7141226186105 (diff) | |
| download | rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.tar.gz rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.tar.bz2 rsyslog-2eea95f626badb5a93ff7eca97cc68e5d2f3940a.zip | |
Merge branch 'master' into master-elasticsearch
Conflicts:
plugins/omelasticsearch/omelasticsearch.c
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 06c553be..dcb5b185 100644 --- a/runtime/errmsg.c +++ b/runtime/errmsg.c @@ -83,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); |