diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /lib/system_check | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/system_check')
-rw-r--r-- | lib/system_check/incoming_email/imap_authentication_check.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index 613c2296375..056021d460c 100644 --- a/lib/system_check/incoming_email/imap_authentication_check.rb +++ b/lib/system_check/incoming_email/imap_authentication_check.rb @@ -28,9 +28,12 @@ module SystemCheck private def try_connect_imap - imap = Net::IMAP.new(config[:host], port: config[:port], ssl: config[:ssl]) - imap.starttls if config[:start_tls] - imap.login(config[:email], config[:password]) + config.each do |mailbox| + $stdout.puts "Checking #{mailbox[:email]}" + imap = Net::IMAP.new(mailbox[:host], port: mailbox[:port], ssl: mailbox[:ssl]) + imap.starttls if mailbox[:start_tls] + imap.login(mailbox[:email], mailbox[:password]) + end true rescue => error @error = error @@ -51,7 +54,7 @@ module SystemCheck erb.filename = mail_room_config_path config_file = YAML.load(erb.result) - config_file.dig(:mailboxes, 0) + config_file[:mailboxes] end end end |