diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 11:48:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-09 11:48:52 +0200 |
| commit | d6b6b30c189bf8ea78b59b8b4d3008d1f89ef1b3 (patch) | |
| tree | d94418b20afbbd3bc7de4fee58e6dbb7f958ad5c /tools/omusrmsg.c | |
| parent | f7ad5aeff03833879957ef00136610d1138a7212 (diff) | |
| download | rsyslog-d6b6b30c189bf8ea78b59b8b4d3008d1f89ef1b3.tar.gz rsyslog-d6b6b30c189bf8ea78b59b8b4d3008d1f89ef1b3.tar.xz rsyslog-d6b6b30c189bf8ea78b59b8b4d3008d1f89ef1b3.zip | |
added capability to emit config error location info for warnings
otherwise, omusrmsg's warning about new config format was not
accompanied by problem location.
Diffstat (limited to 'tools/omusrmsg.c')
| -rw-r--r-- | tools/omusrmsg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index 6d46813e..459e5fd6 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -273,6 +273,7 @@ ENDdoAction BEGINparseSelectorAct uchar *q; int i; + int bHadWarning = 0; CODESTARTparseSelectorAct CODE_STD_STRING_REQUESTparseSelectorAct(1) /* User names must begin with a gnu e-regex: @@ -290,6 +291,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) "action '%s' treated as ':omusrmsg:%s' - please " "change syntax, '%s' will not be supported in the future", p, p, p); + bHadWarning = 1; } } @@ -325,6 +327,8 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) != RS_RET_OK) goto finalize_it; } + if(iRet == RS_RET_OK && bHadWarning) + iRet = RS_RET_OK_WARN; CODE_STD_FINALIZERparseSelectorAct ENDparseSelectorAct |