From 47b88a1bb2df6112bf3240b48c98b262fc4565c2 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 12 Mar 2013 15:49:58 -0400 Subject: [PATCH] add hourly check for upload queue issues, restore old note coloring --- .../stylesheets/specific/notes.css.scss | 4 ++-- app/logical/upload_error_checker.rb | 20 +++++++++++++++++++ config/monit.conf | 4 ++++ config/schedule.rb | 4 ++++ script/donmai/delayed_job_count | 3 --- 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 app/logical/upload_error_checker.rb create mode 100644 config/monit.conf delete mode 100755 script/donmai/delayed_job_count diff --git a/app/assets/stylesheets/specific/notes.css.scss b/app/assets/stylesheets/specific/notes.css.scss index 9e08bd833..97353b09b 100644 --- a/app/assets/stylesheets/specific/notes.css.scss +++ b/app/assets/stylesheets/specific/notes.css.scss @@ -5,7 +5,7 @@ div#note-container { div.note-body { position: absolute; border: 1px solid black; - background: white; + background: #FFE; min-width: 10px; min-height: 1em; line-height: normal; @@ -48,7 +48,7 @@ div#note-container { div.note-box-inner-border { border: 1px solid black; - background: white; + background: #FFE; } div.note-box-inner-border.unsaved { diff --git a/app/logical/upload_error_checker.rb b/app/logical/upload_error_checker.rb new file mode 100644 index 000000000..4fe1a5ebb --- /dev/null +++ b/app/logical/upload_error_checker.rb @@ -0,0 +1,20 @@ +#!/usr/bin/env ruby + +require 'mail' + +class UploadErrorChecker + def check! + count = Upload.where("status like 'error%' and created_at >= ?", 1.hour.ago).count + if count > 5 + mail = Mail.new do + from "webmaster@danbooru.donmai.us" + to "r888888888@gmail.com" + subject "[danbooru] Upload error count at #{count}" + body "nt" + end + mail.delivery_method :sendmail + mail.deliver + end + end +end + diff --git a/config/monit.conf b/config/monit.conf new file mode 100644 index 000000000..34dab7005 --- /dev/null +++ b/config/monit.conf @@ -0,0 +1,4 @@ +set alert r888888888@gmail.com + +check process delayed_job with pidfile /var/www/danbooru2/shared/pids/delayed_job.pid + alert r888888888@gmail.com only on {nonexist} diff --git a/config/schedule.rb b/config/schedule.rb index 9507b887a..1808cda84 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -4,6 +4,10 @@ every 4.hours do runner "TagSubscription.process_all" end +every 1.hour do + runner "UploadErrorChecker.new.check!" +end + every 1.day do runner "PostPruner.new.prune!" end diff --git a/script/donmai/delayed_job_count b/script/donmai/delayed_job_count deleted file mode 100755 index 1a16829e6..000000000 --- a/script/donmai/delayed_job_count +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -psql -hdbserver -c 'select count(*) from delayed_jobs' -Pt -A danbooru2 > /tmp/delayed_job_count