diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:35 +0200 |
| commit | dc40e3b43fa92d06ba03c4bb434f885db0ed4352 (patch) | |
| tree | 06c889fed68defb364e0de21bfe718e925198ba8 /runtime/rsconf.c | |
| parent | 83b9b63e46560911fb2fbab238e30c9e54f5d4c6 (diff) | |
| parent | 760b23aac9718c77ab6f5c56dc06ad173690a92b (diff) | |
| download | rsyslog-dc40e3b43fa92d06ba03c4bb434f885db0ed4352.tar.gz rsyslog-dc40e3b43fa92d06ba03c4bb434f885db0ed4352.tar.xz rsyslog-dc40e3b43fa92d06ba03c4bb434f885db0ed4352.zip | |
Merge branch 'v6-devel'
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 3f99e7b7..7fe573f6 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -93,6 +93,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 */ @@ -1149,6 +1150,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; |