-
Notifications
You must be signed in to change notification settings - Fork 0
custom health check to verify mail password is set #9
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
davezuckerman
wants to merge
3
commits into
main
Choose a base branch
from
AP-537-actionmailer-healthcheck
base: main
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.
+43
−5
Open
Changes from all commits
Commits
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| require 'net/smtp' | ||
|
|
||
| # frozen_string_literal: true | ||
|
|
||
| # Health check configuration | ||
|
|
@@ -6,7 +8,7 @@ | |
| OkComputer.check_in_parallel = true | ||
|
|
||
| class AlmaPatronCheck < OkComputer::Check | ||
| TEST_PATRON_ID = '[email protected]' | ||
| TEST_PATRON_ID = '[email protected]'.freeze | ||
|
|
||
| def check | ||
| Alma::User.find(TEST_PATRON_ID) | ||
|
|
@@ -18,11 +20,47 @@ def check | |
| end | ||
| end | ||
|
|
||
| # rubocop:disable Metrics/MethodLength, Metrics/AbcSize | ||
| class MailConnectivityCheck < OkComputer::Check | ||
| OkComputer::Registry.register 'mail-connectivity', MailConnectivityCheck.new if ActionMailer::Base.delivery_method == :smtp | ||
|
Member
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. two things:
|
||
|
|
||
| # Check that the mail password is set | ||
| def check | ||
| settings = ActionMailer::Base.smtp_settings | ||
| begin | ||
| Net::SMTP.start( | ||
| settings[:address], | ||
| settings[:port], | ||
| settings[:domain], | ||
| settings[:user_name], | ||
| settings[:password], | ||
| settings[:authentication], | ||
| tls: true | ||
| ) { mark_message 'Connection for smtp successful' } | ||
| rescue Net::SMTPAuthenticationError => e | ||
| mark_failure | ||
| Rails.logger.warn "SMTP authentication error: #{e}" | ||
| mark_message 'SMTP Error: Authentication failed. Check logs for more details' | ||
| rescue Net::SMTPServerBusy, Net::SMTPSyntaxError, Net::SMTPFatalError, Net::SMTPUnknownError => e | ||
| mark_failure | ||
| Rails.logger.warn "SMTP Error: #{e}" | ||
| mark_message 'SMTP error. Check logs for more details' | ||
| rescue IOError, Net::ReadTimeout => e | ||
| mark_failure | ||
| Rails.logger.warn "SMTP Timeout: #{e}" | ||
| mark_message 'SMTP Connection error: Timeout. Check logs for more details' | ||
| rescue StandardError => e | ||
| # Catch any other unexpected errors | ||
| mark_failure | ||
| Rails.logger.warn "SMTP standard error: #{e}" | ||
| mark_message 'SMTP ERROR: Could not connect. Check logs for more details' | ||
| end | ||
| end | ||
| end | ||
| # rubocop:enable Metrics/MethodLength, Metrics/AbcSize | ||
|
|
||
| # Ensure Alma API is working. | ||
| OkComputer::Registry.register 'alma-patron-lookup', AlmaPatronCheck.new | ||
|
|
||
| # Ensure database migrations have been run. | ||
| OkComputer::Registry.register 'database-migrations', OkComputer::ActiveRecordMigrationsCheck.new | ||
|
|
||
| # Ensure connectivity to the mail system. | ||
| OkComputer::Registry.register 'action-mailer', OkComputer::ActionMailerCheck.new | ||
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
Oops, something went wrong.
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.
nit: move these two lines below the
# frozen_string_literal: truestatement, and you can remove the explicit call to the#freezemethod you added on line 11.