diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-27 18:07:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-27 18:07:14 +0200 |
| commit | c6fc7f5ba321047aaa20a79ac47fcc2d529a3415 (patch) | |
| tree | cad03d9a75a9c98f409ac033815095b16b6afd5b /tools/omfile.c | |
| parent | 5930014cddf4ed5a5d0970f2a3b16be002c1ce4c (diff) | |
| download | rsyslog-c6fc7f5ba321047aaa20a79ac47fcc2d529a3415.tar.gz rsyslog-c6fc7f5ba321047aaa20a79ac47fcc2d529a3415.tar.xz rsyslog-c6fc7f5ba321047aaa20a79ac47fcc2d529a3415.zip | |
merge fix: made mistake when merging in v5-devel changes, now fixing
Diffstat (limited to 'tools/omfile.c')
| -rw-r--r-- | tools/omfile.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 0407efa2..d35e7df8 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -798,18 +798,6 @@ CODESTARTparseSelectorAct pData->iIOBufSize = (int) cs.iIOBufSize; pData->iFlushInterval = cs.iFlushInterval; pData->bUseAsyncWriter = cs.bUseAsyncWriter; - - if(pData->bDynamicName == 0) { - /* try open and emit error message if not possible. At this stage, we ignore the - * return value of prepareFile, this is taken care of in later steps. - */ - prepareFile(pData, pData->f_fname); - - if(pData->pStrm == NULL) { - DBGPRINTF("Error opening log file: %s\n", pData->f_fname); - errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could no open output file '%s'", pData->f_fname); - } - } CODE_STD_FINALIZERparseSelectorAct ENDparseSelectorAct @@ -897,7 +885,7 @@ SCOPINGmodInit CHKiRet(omsdRegCFSLineHdlr((uchar *)"filecreatemode", 0, eCmdHdlrFileCreateMode, NULL, &cs.fCreateMode, STD_LOADABLE_MODULE_ID, eConfObjAction)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"createdirs", 0, eCmdHdlrBinary, NULL, &cs.bCreateDirs, STD_LOADABLE_MODULE_ID, eConfObjAction)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"failonchownfailure", 0, eCmdHdlrBinary, NULL, &cs.bFailOnChown, STD_LOADABLE_MODULE_ID, eConfObjAction)); - CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileForceChown", 0, eCmdHdlrGoneAway, NULL, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileforcechown", 0, eCmdHdlrGoneAway, NULL, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"actionfileenablesync", 0, eCmdHdlrBinary, NULL, &cs.bEnableSync, STD_LOADABLE_MODULE_ID, eConfObjAction)); CHKiRet(regCfSysLineHdlr((uchar *)"actionfiledefaulttemplate", 0, eCmdHdlrGetWord, NULL, &cs.pszFileDfltTplName, NULL, eConfObjAction)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); |