From 985baf49f9a8ce4951469586c904dd73eb75b192 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Mon, 19 Aug 2013 23:56:23 -0700 Subject: [PATCH 1/6] Less drama when displaying error message. --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index 9b4288d..ab4c9f2 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -51,7 +51,7 @@ STR_MULTIPLE_SYSLOG_MESSAGE = ("Multiple syslogd are running.") STR_AUTHTOKEN_NOTFOUND_MESSAGE = ("No Customer Tokens were found.") STR_AUTHENTICATION_FAIL_MESSAGE = ("Authentication fail for user %s") -VERIFICATION_FAIL_MESSAGE = ("!!!!!! Loggly verification failed." +VERIFICATION_FAIL_MESSAGE = ("Loggly verification failed." "Please contact support@loggly.com" "for more information.") STR_EXIT_MESSAGE = ("\nThis environment (OS : %s) is not supported by " From e8dc90eab1ad120b2dd232f335d8551748661317 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Tue, 20 Aug 2013 00:18:09 -0700 Subject: [PATCH 2/6] Add whitespace between two words. --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index ab4c9f2..4c983fd 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -801,7 +801,7 @@ def get_auth_token(loggly_user, loggly_password, loggly_subdomain): for _ in range(0, 5): try: str_msg = ("Please select (1-" + str(index + 1) + ")" - "to specify which Customer Token" + "to specify which Customer Token " "you want to use. (Default is 1): ") user_choice = int(usr_input(str_msg)) - 1 if user_choice < 0 or user_choice > (index): From 51e3bac166d5c42a4756c7e61a1a5f03d8e3eae1 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Tue, 20 Aug 2013 00:18:37 -0700 Subject: [PATCH 3/6] More required whitespace. --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index 4c983fd..70ba12f 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -793,7 +793,7 @@ def get_auth_token(loggly_user, loggly_password, loggly_subdomain): user_choice = 0 if len(auth_tokens) > 1: Logger.printLog(("Multiple Customer Tokens" - "received from server."), + " received from server."), print_comp = True) for index in range(0, len(auth_tokens)): Logger.printLog("\t%d. %s"%(index + 1, auth_tokens[index]), From d98dc4a9913a407202ef174527459e448659020d Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Tue, 20 Aug 2013 00:21:19 -0700 Subject: [PATCH 4/6] The system is configured, not Loggly. --- configure-syslog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure-syslog.py b/configure-syslog.py index 70ba12f..6f267ab 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -818,8 +818,8 @@ def get_auth_token(loggly_user, loggly_password, loggly_subdomain): prio = 'warning', print_comp = True) user_choice = 0 token = auth_tokens[user_choice] - Logger.printLog(('\nLoggly will be configured with ' - '\"%s\" Customer Token.\n' % token), + Logger.printLog(('\nThis system is now configured to use ' + '\"%s\" as its Customer Token.\n' % token), print_comp = True) return { "token" : token, "id": DISTRIBUTION_ID } else: From 621fad49ec85d8621d2c161a6e2a0cf3c43fca2e Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Tue, 20 Aug 2013 00:23:23 -0700 Subject: [PATCH 5/6] Even more required whitespace. --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index 6f267ab..39a4754 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -53,7 +53,7 @@ STR_AUTHENTICATION_FAIL_MESSAGE = ("Authentication fail for user %s") VERIFICATION_FAIL_MESSAGE = ("Loggly verification failed." "Please contact support@loggly.com" - "for more information.") + " for more information.") STR_EXIT_MESSAGE = ("\nThis environment (OS : %s) is not supported by " "the Loggly Syslog Configuration Script. Please contact " "support@loggly.com for more information.\n") From 2680f23e9770b537f33a798ab18619ac43034bbc Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Tue, 20 Aug 2013 00:23:53 -0700 Subject: [PATCH 6/6] And more whitespace. --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index 39a4754..1cc455c 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -51,7 +51,7 @@ STR_MULTIPLE_SYSLOG_MESSAGE = ("Multiple syslogd are running.") STR_AUTHTOKEN_NOTFOUND_MESSAGE = ("No Customer Tokens were found.") STR_AUTHENTICATION_FAIL_MESSAGE = ("Authentication fail for user %s") -VERIFICATION_FAIL_MESSAGE = ("Loggly verification failed." +VERIFICATION_FAIL_MESSAGE = ("Loggly verification failed. " "Please contact support@loggly.com" " for more information.") STR_EXIT_MESSAGE = ("\nThis environment (OS : %s) is not supported by "