From 534f7fc161a6002d68ab90ae36a1e21d6d1f4d08 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip@loggly.com>
Date: Sun, 15 Sep 2013 14:27:09 -0700
Subject: [PATCH 1/3] Some minor copy changes.

---
 configure-syslog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure-syslog.py b/configure-syslog.py
index 840c1c7..0ee64b3 100755
--- a/configure-syslog.py
+++ b/configure-syslog.py
@@ -92,7 +92,8 @@
                      "\nyour account name is mycompany.\n")
 AUTHTOKEN_MODIFICATION_TEXT = ("\nIf you wish to use a different Customer Token, "
                                "replace %s\nwith the token you wish to use, in"
-                               " the file %s.")
+                               " the file %s.\n")
+INSTALLATION_COMPLETED_TEXT = ("Installation completed.\n")
 
 _LOG_SOCKET = None
 OUR_PROGNAME      = "configure-syslog"
@@ -1308,7 +1309,7 @@ def install(current_environment):
     printLog(AUTHTOKEN_MODIFICATION_TEXT %
                     (authorization_details['token'],
                      modified_config_file))
-    printLog("Installation completed")
+    printLog(INSTALLATION_COMPLETED_TEXT)
     return syslog_name_for_configuration
 
 def verify(current_environment):

From 0d30246dc171f52bd25229935ee8287d0280a420 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip@loggly.com>
Date: Sun, 15 Sep 2013 14:36:10 -0700
Subject: [PATCH 2/3] Group rsyslog comments with the relevant part of the
 config file.

---
 configure-syslog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure-syslog.py b/configure-syslog.py
index 0ee64b3..e7dfde7 100755
--- a/configure-syslog.py
+++ b/configure-syslog.py
@@ -141,8 +141,8 @@
 # Define the template used for sending logs to Loggly. Do not change this format.
 $template LogglyFormat,"<%%pri%%>%%protocol-version%% %%timestamp:::date-rfc3339%% \
 %%HOSTNAME%% %%app-name%% %%procid%% %%msgid%% [%s@%s tag=\\"example\\"] %%msg%%"
-# Send messages to syslog server listening on TCP port using template
 
+# Send messages to Loggly over TCP using the template.
 *.*             @@%s:%s;LogglyFormat
 
 #          -------------------------------------------------------

From fda286d9a5f4f9a3eab14f4f304f8a083ea8f0ca Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip@loggly.com>
Date: Sun, 15 Sep 2013 14:37:22 -0700
Subject: [PATCH 3/3] No more need for an example tag.

---
 configure-syslog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure-syslog.py b/configure-syslog.py
index e7dfde7..2f59059 100755
--- a/configure-syslog.py
+++ b/configure-syslog.py
@@ -123,7 +123,7 @@
 
 %s
 template LogglyFormat { template("<${PRI}>1 ${ISODATE} ${HOST} ${PROGRAM} \
-${PID} ${MSGID} [%s@%s tag=\\"example\\"] $MSG\\n");};
+${PID} ${MSGID} [%s@%s] $MSG\\n");};
 destination d_loggly { tcp("%s" port(%s) template(LogglyFormat) flush_timeout(1000) frac_digits(3)); };
 log { source(%s); destination(d_loggly); };
 
@@ -140,7 +140,7 @@
 
 # Define the template used for sending logs to Loggly. Do not change this format.
 $template LogglyFormat,"<%%pri%%>%%protocol-version%% %%timestamp:::date-rfc3339%% \
-%%HOSTNAME%% %%app-name%% %%procid%% %%msgid%% [%s@%s tag=\\"example\\"] %%msg%%"
+%%HOSTNAME%% %%app-name%% %%procid%% %%msgid%% [%s@%s] %%msg%%"
 
 # Send messages to Loggly over TCP using the template.
 *.*             @@%s:%s;LogglyFormat