summaryrefslogtreecommitdiffstats
path: root/test.conf
diff options
context:
space:
mode:
Diffstat (limited to 'test.conf')
-rw-r--r--test.conf8
1 files changed, 7 insertions, 1 deletions
diff --git a/test.conf b/test.conf
index c7a994db..25827ba8 100644
--- a/test.conf
+++ b/test.conf
@@ -16,7 +16,7 @@
# \ = \\
# --> '\' is used to escape (as in C)
#$template TraditionalFormat,"%UxTradMsg%\n",1024
-#$template MySQLInsert,"insert iut, msg values (1, '%msg') into systemevents",SQL,MAXSIZE=1024
+#$template MySQLInsert,"insert iut, msg values (1, '%msg%') into systemevents",SQL,MAXSIZE=1024
$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg%\n"
$template precise,"%syslogpriority%,%syslogfacility%,%timegenerated%,%HOSTNAME%,%syslogtag%,%msg%\n",1024
$template RFC3164fmt,"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg%"
@@ -37,5 +37,11 @@ $template wallmsg,"\r\n\7Message from syslogd@%HOSTNAME% at %timegenerated:::dat
#*.* *;MySQLInsert
#*.* /home/rger/proj/rsyslog/logfile;precise
#*.* /home/rger/proj/rsyslog/logfile;UserMsg
+<<<<<<< test.conf
#*.* /home/rger/proj/rsyslog/tradfile;TraditionalFormat
#*.* @172.19.2.16;RFC3164fmt
+*.* >localhost,AdisconDB,root,
+=======
+#*.* /home/rger/proj/rsyslog/tradfile;TraditionalFormat
+#*.* @172.19.2.16;RFC3164fmt
+>>>>>>> 1.4