diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
| commit | ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8 (patch) | |
| tree | 74dbe259b64d8f6e839e5c99a7d99f2edaf32f2b /runtime/rsconf.c | |
| parent | 40334847b685e6058be562b4436f72426637f4d8 (diff) | |
| parent | b397a80c88be0de6e7450bcbeb3524be98e572b6 (diff) | |
| download | rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.gz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.xz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 9ee13dd4..bd002353 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -94,7 +94,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_StdJSONFmt[] = "\"{\\\"message\\\":\\\"%msg%\\\",\\\"fromhost\\\":\\\"%HOSTNAME%\\\",\\\"facility\\\":\\\"%syslogfacility-text%\\\",\\\"priority\\\":\\\"%syslogpriority-text%\\\",\\\"timereported\\\":\\\"%timereported:::date-rfc3339%\\\",\\\"timegenerated\\\":\\\"%timegenerated:::date-rfc3339%\\\"}\",JSON"; +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 */ void cnfDoCfsysline(char *ln); |