rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2026-06-20 08:42:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1859 from rgerhards/i-1832

Browse Source 
omfile: hande file open error via SUSPEND mode
This commit is contained in:
Rainer Gerhards 2017-10-19 13:34:39 +02:00 committed by GitHub
commit f4f53b06eb
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

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

5
tools/omfile.c
View File

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