-
-
Notifications
You must be signed in to change notification settings - Fork 332
[BUG] Improved string matching with exit-code-based detection for db connection #450
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
Open
JayShenkar07
wants to merge
2
commits into
mautic:mautic5
Choose a base branch
from
JayShenkar07:fix-mysql-connection
base: mautic5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -3,37 +3,30 @@ | |||||||
| source /startup/logger.sh | ||||||||
|
|
||||||||
| function check_database_connection { | ||||||||
| local IS_MYSQL_ALIVE=false | ||||||||
| local FAILURE_COUNT=0 | ||||||||
| local MAX_FAILURE_COUNT=31 | ||||||||
|
|
||||||||
| while [[ "${IS_MYSQL_ALIVE}" != "mysqld is alive" ]]; do | ||||||||
| log_debug "Starting MySQL connection check (max attempts: ${MAX_FAILURE_COUNT})..." | ||||||||
|
|
||||||||
| while [[ $FAILURE_COUNT -lt $MAX_FAILURE_COUNT ]]; do | ||||||||
| FAILURE_COUNT=$((FAILURE_COUNT + 1)) | ||||||||
| if [[ $FAILURE_COUNT -gt $MAX_FAILURE_COUNT ]]; then | ||||||||
| log_startup_error_header | ||||||||
| log_error "MySQL is not responding after ${MAX_FAILURE_COUNT} attempts. Exiting." | ||||||||
| log_error "Please ensure the MySQL server is running and accessible from this container." | ||||||||
| exit 1 | ||||||||
| fi | ||||||||
|
|
||||||||
| if [[ "${IS_MYSQL_ALIVE}" =~ "error" ]]; then | ||||||||
| log_error "MySQL response contained error: ${IS_MYSQL_ALIVE}" | ||||||||
| log "We will continue to retry the connection." | ||||||||
| # Try the connection using exit code | ||||||||
| if mysqladmin ping --host="${MAUTIC_DB_HOST}" --port="${MAUTIC_DB_PORT}" \ | ||||||||
| --user="${MAUTIC_DB_USER}" --password="${MAUTIC_DB_PASSWORD}" &>/dev/null; then | ||||||||
| log_debug "MySQL is alive and reachable on attempt ${FAILURE_COUNT}/${MAX_FAILURE_COUNT}!" | ||||||||
| return 0 | ||||||||
| else | ||||||||
| log "MySQL is not ready yet, waiting..." | ||||||||
| log "MySQL is not ready yet, waiting... Attempt ${FAILURE_COUNT}/${MAX_FAILURE_COUNT}" | ||||||||
| fi | ||||||||
| sleep 1 | ||||||||
|
|
||||||||
| # try the connection | ||||||||
| log_debug "Checking DB connection to ${MAUTIC_DB_HOST}:${MAUTIC_DB_PORT} with user ${MAUTIC_DB_USER}" | ||||||||
| IS_MYSQL_ALIVE=$(mysqladmin --host="${MAUTIC_DB_HOST}" --port="${MAUTIC_DB_PORT}" --user="${MAUTIC_DB_USER}" --password="${MAUTIC_DB_PASSWORD}" ping 2>&1) | ||||||||
| sleep 1 | ||||||||
| done | ||||||||
|
|
||||||||
| # we either maxed our connection attempts or we got a successful response | ||||||||
| log_debug "MySQL connection check response: ${IS_MYSQL_ALIVE}" | ||||||||
| if [[ "${IS_MYSQL_ALIVE}" == "mysqld is alive" ]]; then | ||||||||
| log_debug "MySQL is alive and well." | ||||||||
| fi | ||||||||
| # Max attempts reached | ||||||||
| log_error "MySQL is not responding after ${MAX_FAILURE_COUNT} attempts. Exiting." | ||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| log_error "Please ensure the MySQL server is running and accessible from this container." | ||||||||
| exit 1 | ||||||||
| } | ||||||||
|
|
||||||||
| log_debug "Checking database connection is alive and well..." | ||||||||
|
|
||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maintaining these error logs would be better, as they allow people to diagnose their DB.