Skip to content

LOG-1638: Fix check for existence of subdomain #122

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.

Sign up for GitHub

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

Merged
minicuts merged 1 commit into from
Nov 20, 2018
Merged

LOG-1638: Fix check for existence of subdomain #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Linux Script/configure-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,11 @@ checkIfLogglyServersAccessible() {

echo "INFO: Checking if '$LOGGLY_ACCOUNT' subdomain is valid."
if [[ $LOGGLY_ACCOUNT != $INVALID_SUBDOMAIN ]]; then
if [[ $(curl -L -s --head --request GET $LOGGLY_ACCOUNT_URL/login -w '%{http_code}' -o /dev/null) == "200" ]]; then
echo "INFO: $LOGGLY_ACCOUNT_URL is valid and reachable."
if curl --head -s --request GET $LOGGLY_ACCOUNT_URL/login | grep -q "accounts/invalid" ; then
logMsgToConfigSysLog "ERROR" "ERROR: This is not a recognized subdomain. Please ask the account owner for the subdomain they signed up with."
exit 1
else
logMsgToConfigSysLog "ERROR" "ERROR: This is not a recognized subdomain. Please ask the account owner for the subdomain they signed up with."
exit 1
echo "INFO: $LOGGLY_ACCOUNT_URL is valid and reachable."
fi
else
logMsgToConfigSysLog "ERROR" "ERROR: This is not a recognized subdomain. Please ask the account owner for the subdomain they signed up with. Please note that your subdomain is just the first string in your loggly account URL not the entire account name."
Expand Down
6 changes: 3 additions & 3 deletions Mac Script/configure-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,11 @@ checkIfLogglyServersAccessible() {

echo "INFO: Checking if '$LOGGLY_ACCOUNT' subdomain is valid."
if [[ $LOGGLY_ACCOUNT != $INVALID_SUBDOMAIN ]]; then
if [ $(curl -s --head --request GET $LOGGLY_ACCOUNT_URL/login | grep "200 OK\|HTTP/2 200" | wc -l) == 1 ]; then
echo "INFO: $LOGGLY_ACCOUNT_URL is valid and reachable."
else
if curl --head -s --request GET $LOGGLY_ACCOUNT_URL/login | grep -q "accounts/invalid" ; then
logMsgToConfigSysLog "ERROR" "ERROR: This is not a recognized subdomain. Please ask the account owner for the subdomain they signed up with."
exit 1
else
echo "INFO: $LOGGLY_ACCOUNT_URL is valid and reachable."
fi
else
logMsgToConfigSysLog "ERROR" "ERROR: This is not a recognized subdomain. Please ask the account owner for the subdomain they signed up with. Please note that your subdomain is just the first string in your loggly account URL not the entire account name."
Expand Down