diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
| commit | 760b23aac9718c77ab6f5c56dc06ad173690a92b (patch) | |
| tree | be465081896848eea8cadbb35c0eb602a71c7202 /runtime/rsconf.c | |
| parent | 88154352094b2014bacaed2e5ee15c9b77ed19d5 (diff) | |
| parent | 1e6469e92096f9f6c04cb80479ab049a9caa4fa2 (diff) | |
| download | rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.gz rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.xz rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 032d01a3..67a13893 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -95,6 +95,7 @@ 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_spoofadr[] = "\"%fromhost-ip%\""; +static uchar template_SysklogdFileFormat[] = "\"%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n\""; static uchar template_StdJSONFmt[] = "\"{\\\"message\\\":\\\"%msg:::json%\\\",\\\"fromhost\\\":\\\"%HOSTNAME:::json%\\\",\\\"facility\\\":\\\"%syslogfacility-text%\\\",\\\"priority\\\":\\\"%syslogpriority-text%\\\",\\\"timereported\\\":\\\"%timereported:::date-rfc3339%\\\",\\\"timegenerated\\\":\\\"%timegenerated:::date-rfc3339%\\\"}\""; /* end templates */ @@ -1237,6 +1238,8 @@ initLegacyConf(void) tplAddLine(ourConf, " StdUsrMsgFmt", &pTmp); pTmp = template_StdDBFmt; tplAddLine(ourConf, " StdDBFmt", &pTmp); + pTmp = template_SysklogdFileFormat; + tplAddLine(ourConf, "RSYSLOG_SysklogdFileFormat", &pTmp); pTmp = template_StdPgSQLFmt; tplAddLine(ourConf, " StdPgSQLFmt", &pTmp); pTmp = template_StdJSONFmt; |