Skip to content

Commit

Permalink
Bump haproxy to 2.9.2, fix reset flag (shouldnt stop on error as gres…
Browse files Browse the repository at this point in the history
…t schema may not exist), and grest-poll
  • Loading branch information
rdlrt committed Jan 12, 2024
1 parent 9de48b6 commit 02b03a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/grest-helper-scripts/grest-poll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function chk_cache_status() {
log_err "Active Stake cache for epoch ${epoch} still not populated as of ${epoch_slot} slot, maximum tolerance was $(( epoch_length / 6 )) !!"
optexit
fi
if [[ "last_epoch_summary" != "${epoch}" ]]; then
if [[ "${last_epoch_summary}" != "${epoch}" ]]; then
log_err "Epoch Summary Cache for epoch ${epoch} still not populated as of ${epoch_slot} slot, maximum tolerance was $(( epoch_length / 6 )) !!"
optexit
fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/grest-helper-scripts/setup-grest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ SGVERSION=v1.1.1
printf "\n[Re]Installing HAProxy.."
pushd ~/tmp >/dev/null || err_exit
major_v="2.9"
minor_v="1"
minor_v="2"
haproxy_url="http://www.haproxy.org/download/${major_v}/src/haproxy-${major_v}.${minor_v}.tar.gz"
if curl -sL -f -m ${CURL_TIMEOUT} -o haproxy.tar.gz "${haproxy_url}"; then
tar xf haproxy.tar.gz &>/dev/null && rm -f haproxy.tar.gz
Expand Down Expand Up @@ -560,7 +560,7 @@ SGVERSION=v1.1.1
err_exit "Failed to get basic db setup SQL from ${basics_sql_url}"
fi
printf "\nAdding grest schema if missing and granting usage for web_anon..."
! output=$(psql "${PGDATABASE}" -v "ON_ERROR_STOP=1" -q <<<${basics_sql} 2>&1) && err_exit "${output}"
! output=$(psql "${PGDATABASE}" -q <<<${basics_sql} 2>&1) && err_exit "${output}"
return 0
}

Expand Down

0 comments on commit 02b03a7

Please sign in to comment.