From c01a1f0f00d15423b2be7b0fc8fb49926ad41431 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Mon, 2 Jul 2018 10:49:26 -0700 Subject: [PATCH] remove hardcoded references to webmaster@danbooru.donmai.us and r888888888@gmail.com --- app/logical/delayed_job_error_checker.rb | 8 +++++--- app/logical/upload_error_checker.rb | 8 +++++--- config/schedule.rb | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/logical/delayed_job_error_checker.rb b/app/logical/delayed_job_error_checker.rb index c51d135e4..6304177e4 100644 --- a/app/logical/delayed_job_error_checker.rb +++ b/app/logical/delayed_job_error_checker.rb @@ -7,9 +7,11 @@ class DelayedJobErrorChecker errors = Delayed::Job.where("last_error is not null").limit(100).pluck(:last_error).map {|x| x[0..100]} if errors.size == 100 mail = Mail.new do - from "webmaster@danbooru.donmai.us" - to "r888888888@gmail.com" - subject "[danbooru] Delayed job error count at #{errors}" + from Danbooru.config.contact_email + to Danbooru.config.contact_email + CurrentUser.as_system do + subject "[#{Danbooru.config.app_name}] Delayed job error count at #{errors}" + end body errors.uniq.join("\n") end mail.delivery_method :sendmail diff --git a/app/logical/upload_error_checker.rb b/app/logical/upload_error_checker.rb index 34301ea60..f41afdf31 100644 --- a/app/logical/upload_error_checker.rb +++ b/app/logical/upload_error_checker.rb @@ -7,9 +7,11 @@ class UploadErrorChecker uploads = Upload.where("status like 'error%' and status not like 'error: Upload::Error - Post with MD5%' and status not like 'error: RuntimeError - duplicate%' and created_at >= ?", 1.hour.ago) if uploads.size > 5 mail = Mail.new do - from "webmaster@danbooru.donmai.us" - to "r888888888@gmail.com" - subject "[danbooru] Upload error count at #{uploads.size}" + from Danbooru.config.contact_email + to Danbooru.config.contact_email + CurrentUser.as_system do + subject "[#{Danbooru.config.app_name}] Upload error count at #{uploads.size}" + end body uploads.map {|x| x.status}.join("\n") end mail.delivery_method :sendmail diff --git a/config/schedule.rb b/config/schedule.rb index 7512fd696..ba086fe28 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -1,5 +1,5 @@ set :output, "/var/log/whenever.log" -env "MAILTO", "webmaster@danbooru.donmai.us" +#env "MAILTO", "webmaster@danbooru.donmai.us" every 1.hour do runner "UploadErrorChecker.new.check!"