Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions lib/mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ def self.send_message(subject,body,attachments=nil)
from_email = "lib-noreply@berkeley.edu"

options = {:address => "smtp.gmail.com",
:port => 587,
:port => 465,
:user_name => mail_envs["MAIL_USERNAME"],
:password => mail_envs["MAIL_PASSWORD"],
:authentication => 'plain',
:enable_starttls_auto => true,
:tls => true,
:return_response => true
}

Expand All @@ -48,12 +48,11 @@ def self.send_message(subject,body,attachments=nil)
add_file attachment if File.file?(attachment)
end
end
logger.info "Email sent"
rescue StandardError => e
logger.info "Error sending email: #{e}"
logger.error "Error sending email: #{e}"
end
end

logger.info "Email sent"

#sleeping for 2 seconds so emails don't get flagged for spamming
sleep 2
Expand Down