Skip to content

Add parameters to database availability pings, show waiting message #159

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

Open
NoDiskInDriveA wants to merge 1 commit into
base: 0.4.x
Choose a base branch
from
Open

Add parameters to database availability pings, show waiting message #159

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: 6 additions & 2 deletions docker/image/console/root/usr/lib/task/database/available.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ function task_database_available()
local command=""

if [ "${DB_PLATFORM}" == "mysql" ]; then
command="mysqladmin -h $DB_HOST -u ${DB_ADMIN_USER:-$DB_USER} -p${DB_ROOT_PASS:-${DB_ADMIN_PASS:-$DB_PASS}} ping --connect_timeout=10"
command="mysqladmin -h $DB_HOST -u ${DB_ADMIN_USER:-$DB_USER} -p${DB_ROOT_PASS:-${DB_ADMIN_PASS:-$DB_PASS}} -P ${DB_PORT} ping --connect_timeout=10"
elif [ "${DB_PLATFORM}" == "postgres" ]; then
command="pg_isready -h $DB_HOST"
command="pg_isready -h $DB_HOST -U ${DB_ADMIN_USER:-$DB_USER} -p ${DB_PORT}"
elif [ "${DB_PLATFORM}" == "" ]; then
# no database is used
return
Expand All @@ -25,6 +25,10 @@ function task_database_available()
exit 1
fi

if ! (( counter % 5 )); then
echo "Waiting for database to become available: '${command}'"
Copy link
Contributor

@kierenevans kierenevans May 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Careful about printing the database password out for mysql. Maybe direct to stderr too?

Copy link
Contributor

@andytson-inviqa andytson-inviqa Jul 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
echo "Waiting for database to become available: '${command}'"
echo "Waiting for database '$DB_HOST' to become available" >&2

fi

sleep 2
((++counter))
done
Expand Down