diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
| commit | d0a83a1f7a762010971a9f909a1e28a83fa7cf2c (patch) | |
| tree | 3bb6451baa10296b0cd40fbf25cc2a16238358ee /tools | |
| parent | 9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (diff) | |
| parent | 545a80918b9a0cc75e12de4a9c718dc875a5276a (diff) | |
| download | rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.gz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.xz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.zip | |
Merge branch 'v4-stable-tmp' into v5-devel-tmp
Conflicts:
dirty.h
tools/syslogd.c
Diffstat (limited to 'tools')
| -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 6bed6a1a..61b56847 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -334,6 +334,7 @@ static uchar template_WallFmt[] = "\"\r\n\7Message from syslogd@%HOSTNAME% at %t 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\""; static uchar template_spoofadr[] = "\"%fromhost-ip%\""; /* end templates */ @@ -2171,6 +2172,8 @@ static rsRetVal mainThread() tplAddLine(" StdUsrMsgFmt", &pTmp); pTmp = template_StdDBFmt; tplAddLine(" StdDBFmt", &pTmp); + pTmp = template_SysklogdFileFormat; + tplAddLine("RSYSLOG_SysklogdFileFormat", &pTmp); pTmp = template_StdPgSQLFmt; tplAddLine(" StdPgSQLFmt", &pTmp); pTmp = template_spoofadr; |