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

Token option #21

Merged
merged 3 commits into from Aug 23, 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

let get_auth_token just return a token

caller can wrap it as needed
  • Loading branch information
Mike Blume
Mike Blume committed Aug 22, 2013
commit e850e700cdb428e2c176c1ec313b83ab5f526e45
@@ -854,7 +854,7 @@ def get_auth_token(loggly_user, loggly_password, loggly_subdomain):
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 }
return token
else:
Logger.printLog("Loggly credentials could not be verified.",
prio = 'crit', print_comp = True)
@@ -1242,8 +1242,8 @@ def install(current_environment):
perform_sanity_check_and_get_product_for_configuration(current_environment)

loggly_user, loggly_password, loggly_subdomain = login()
authorization_details = get_auth_token(loggly_user,
loggly_password, loggly_subdomain)
token = get_auth_token(loggly_user, loggly_password, loggly_subdomain)
authorization_details = {'token': token, 'id': DISTRIBUTION_ID}
# 4. If possible, determine the location of the syslog.conf file or
#the syslog.conf.d/ directory.
# Provide the location as the default and prompt the user for confirmation.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.