Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LOGGLY-3903 Remove prompts to run 'verify' action #33

Merged
merged 2 commits into from Sep 6, 2013
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

LOGGLY-3903 Remove prompts to run 'verify' action

When users run the install script as shown in our docs, the
install-script is never saved to disk, so users cannot re-run the
script with any 'verify' action.

We should not advertise an action they cannot run without
re-downloading the script.
  • Loading branch information
♥ Ivan Tam ♥
♥ Ivan Tam ♥ committed Sep 3, 2013
commit ae74e4c11a7f562aff658be44b81a9095661bc83
@@ -944,9 +944,8 @@ def create_bash_script(content):
config_file = open(file_path, "w")
config_file.write(content)
config_file.close()
Logger.printLog(("Current user is not root user. Run script %s as root,"
"restart syslog service and then "
"run configure-syslog.py again with 'verify'"
Logger.printLog(("Current user is not root user. Run script %s as root then "
"restart the syslog service"
% file_path), prio = 'crit', print_comp = True)

def create_loggly_config_file(syslog_id, syslog_configuration_details,
@@ -1317,14 +1316,18 @@ def install(current_environment):
(authorization_details['token'],
modified_config_file), print_comp = True, prio = 'debug')
Logger.printLog("Installation completed", prio = 'debug')
print("You may verify installation by re-running with action 'verify'")

return syslog_name_for_configuration

def verify(current_environment):
Logger.printLog("Verification started", prio = 'debug')

This comment has been minimized.

@philip-loggly

philip-loggly Sep 3, 2013
Contributor

Nitpick: Do you really want all these blank lines in here?

This comment has been minimized.

@ivangonekrazy

ivangonekrazy Sep 3, 2013
Author Contributor

yes, that block was a pain to read at a glance.

the perform_sanity_check_and_get_product_for_configuration() function call and the tuple destructuring immediately following it made the loggly_user variable et al. appear to be params of said function call.

This comment has been minimized.

@philip-loggly

philip-loggly Sep 3, 2013
Contributor

The function is now formatted completely differently relative to the rest of the script. I don't think we should do this. Unless I am missing something?

This comment has been minimized.

@philip-loggly

philip-loggly Sep 3, 2013
Contributor

Perhaps we could at least group the 3 middle lines together, the guts of the thing.

perform_sanity_check_and_get_product_for_configuration(current_environment)

loggly_user, loggly_password, loggly_subdomain = login()

doverify(loggly_user, loggly_password, loggly_subdomain)

Logger.printLog("Verification completed", prio = 'debug')

def uninstall(current_environment):
@@ -1507,4 +1510,4 @@ def main():
Logger.printLog(traceback.format_exc())
finally:
Logger.printLog('Configure script has errors')
sys.exit(-1)
sys.exit(-1)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.