diff --git a/app/jobs/send_reset_password_email_job.rb b/app/jobs/send_reset_password_email_job.rb index 53bdd9fa8..371de716b 100644 --- a/app/jobs/send_reset_password_email_job.rb +++ b/app/jobs/send_reset_password_email_job.rb @@ -4,6 +4,8 @@ class SendResetPasswordEmailJob < ApplicationJob def perform(email, os, browser) person = Person.find_by_email(email) + Rails.logger.info "Sending reset password email to #{email} from #{os} with #{browser}" + if person&.user # make sure the user exists (i.e. user has not become a tombstone) PasswordMailer.with(person: person, os: os, browser: browser).reset.deliver_now end diff --git a/config/environments/development.rb b/config/environments/development.rb index b29b14136..ae3bc1af2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -75,9 +75,17 @@ config.action_controller.raise_on_missing_callback_actions = true # Since most people will not set the variable, polling will not be logged - config.solid_queue.silence_polling = ENV["SOLID_QUEUE_LOG_POLLING_ON"] != "false" + # anything but explicitly false + log_polling = ENV["SOLID_QUEUE_LOG_POLLING_ON"] != "false" + config.solid_queue.silence_polling = log_polling # NOTE: this is backwards, true means silence config.web_console.permissions = ["192.168.0.0/16", "172.17.0.0/16"] config.hosts << ENV["DEV_HOST"] if ENV["DEV_HOST"].present? + + stdout_logger = ActiveSupport::Logger.new(STDOUT) + tagged_logger = ActiveSupport::TaggedLogging.new(stdout_logger) + + config.log_tags = [ :request_id ] + config.logger = tagged_logger end diff --git a/config/initializers/solid_queue_extension.rb b/config/initializers/solid_queue_extension.rb new file mode 100644 index 000000000..7ff95c58c --- /dev/null +++ b/config/initializers/solid_queue_extension.rb @@ -0,0 +1,17 @@ +module CustomProcess + def heartbeat + # only silence if explicitly set to not log (default to logging) + # true or not set (or anything else) means log, false means silence + silence_heartbeat = ENV["SOLID_QUEUE_LOG_HEARTBEAT_ON"] == "false" + + if silence_heartbeat && ActiveRecord::Base.logger + ActiveRecord::Base.logger.silence { super } + else + super + end + end +end + +Rails.application.config.after_initialize do + SolidQueue::Process.send(:prepend, CustomProcess) +end