rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 18:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

omfile: hande file open error via SUSPEND mode

Browse Source 
For a while, this lead to suspension as the data error was
not detected by the rule engine. This has changed with fixes
in 8.30.0. I asked users what they prefer (and expect) and
everyone meant it should still be handled via suspension. See
github tracker below for more details.

closes https://github.com/rsyslog/rsyslog/issues/1832
This commit is contained in:
Rainer Gerhards 2017-10-18 11:34:07 +02:00
parent a3a4cee34a
commit 75ed9c0955
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@ -51,6 +51,7 @@ TESTS += \
invalid_nested_include.sh \
omfwd-keepalive.sh \
omfile-read-only-errmsg.sh \
omfile-read-only.sh \
omfile_both_files_set.sh \
msgvar-concurrency.sh \
localvar-concurrency.sh \

5
tools/omfile.c
View File

@ -1062,9 +1062,8 @@ CODESTARTcommitTransaction
}
finalize_it:
if (pData->bDynamicName &&
(iRet == RS_RET_FILE_OPEN_ERROR || iRet == RS_RET_FILE_NOT_FOUND) )
iRet = RS_RET_OK;
if(iRet == RS_RET_FILE_OPEN_ERROR || iRet == RS_RET_FILE_NOT_FOUND)
iRet = pData->bDynamicName ? RS_RET_OK : RS_RET_SUSPENDED;
pthread_mutex_unlock(&pData->mutWrite);
ENDcommitTransaction