diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:08:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:08:47 +0100 |
| commit | 159abfbc37e8ae4c86e2c7422f18c7d613b33e7d (patch) | |
| tree | 1ef30765ce567edb349c1469d3efd132a96e317d /tools/syslogd.c | |
| parent | 5f662e81de4ec13bd29ec7b686646b2a8996f45d (diff) | |
| parent | e25dc05e9127537cf2ddbae30b15300f601fbff0 (diff) | |
| download | rsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.tar.gz rsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.tar.xz rsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.zip | |
Merge branch 'tmp' into v4-stable-tmp
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index f66cbee3..eff0a63b 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -386,6 +386,7 @@ static uchar template_TraditionalForwardFormat[] = "\"<%PRI%>%TIMESTAMP% %HOSTNA static uchar template_StdUsrMsgFmt[] = "\" %syslogtag%%msg%\n\r\""; static uchar template_StdDBFmt[] = "\"insert into SystemEvents (Message, Facility, FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, '%timereported:::date-mysql%', '%timegenerated:::date-mysql%', %iut%, '%syslogtag%')\",SQL"; static uchar template_StdPgSQLFmt[] = "\"insert into SystemEvents (Message, Facility, FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, '%timereported:::date-pgsql%', '%timegenerated:::date-pgsql%', %iut%, '%syslogtag%')\",STDSQL"; +static uchar template_SysklogdFileFormat[] = "\"%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n\""; /* end template */ @@ -2871,6 +2872,8 @@ static rsRetVal mainThread() tplAddLine(" StdUsrMsgFmt", &pTmp); pTmp = template_StdDBFmt; tplAddLine(" StdDBFmt", &pTmp); + pTmp = template_SysklogdFileFormat; + tplAddLine("RSYSLOG_SysklogdFileFormat", &pTmp); pTmp = template_StdPgSQLFmt; tplLastStaticInit(tplAddLine(" StdPgSQLFmt", &pTmp)); |