summaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-28 10:02:22 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-28 10:02:22 +0000
commitf2fcb032110bc4b590c96b70518a4e1e1e03b279 (patch)
tree31681d4274e556988f1c841160a63fd26cfb8578 /conf.c
parentf4f27d790c811a9c54fff4dc68cbf6896f2d846a (diff)
downloadrsyslog-f2fcb032110bc4b590c96b70518a4e1e1e03b279.tar.gz
rsyslog-f2fcb032110bc4b590c96b70518a4e1e1e03b279.tar.xz
rsyslog-f2fcb032110bc4b590c96b70518a4e1e1e03b279.zip
- changed default file output format to include high-precision timestamps
- added a buid-in template for previous syslogd file format - added new $ActionFileDefaultTemplate directive
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf.c b/conf.c
index f88216ef..f3f10ba3 100644
--- a/conf.c
+++ b/conf.c
@@ -530,8 +530,10 @@ finalize_it:
* to hold the largest possible filename.
* rgerhards, 2007-07-25
* updated to include OMSR pointer -- rgerhards, 2007-07-27
+ * updated to include template name -- rgerhards, 2008-03-28
*/
-rsRetVal cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts)
+rsRetVal
+cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *pszTpl)
{
register uchar *pName;
int i;
@@ -547,7 +549,7 @@ rsRetVal cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pO
}
*pName = '\0';
- iRet = cflineParseTemplateName(&p, pOMSR, iEntry, iTplOpts, (uchar*) " TradFmt");
+ iRet = cflineParseTemplateName(&p, pOMSR, iEntry, iTplOpts, pszTpl);
RETiRet;
}