From a30cdb0b9cfb2e667bc35d914b333aeebf3e1201 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 15 Mar 2013 11:04:31 -0400
Subject: [PATCH] refactor cron schedule

---
 app/logical/daily_maintenance.rb |  8 ++++++++
 config/schedule.rb               | 14 +++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 app/logical/daily_maintenance.rb

diff --git a/app/logical/daily_maintenance.rb b/app/logical/daily_maintenance.rb
new file mode 100644
index 000000000..4625c2393
--- /dev/null
+++ b/app/logical/daily_maintenance.rb
@@ -0,0 +1,8 @@
+class DailyMaintenance
+  def run
+    PostPruner.new.prune!
+    Upload.delete_all(['created_at < ?', 1.day.ago])
+    ModAction.delete_all(['created_at < ?', 3.days.ago])
+    Delayed::Job.destroy_all(['created_at < ?'], 1.day.ago)
+  end
+end
diff --git a/config/schedule.rb b/config/schedule.rb
index 96cbf8959..07117490e 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -9,25 +9,17 @@ every 1.hour do
 end
 
 every 1.day do
-  runner "PostPruner.new.prune!"
+  runner "DailyMaintenance.new.run"
 end
 
 every 1.day, :at => "1:00 am" do
-  runner "Upload.delete_all(['created_at < ?', 1.day.ago])"
-end
-
-every 1.day, :at => "1:30 am" do
-  runner "ModAction.delete_all(['created_at < ?', 3.days.ago])"
-end
-
-every 1.day, :at => "2:00 am" do
   command "cd /var/www/danbooru2/current ; script/donmai/backup_db"
   command "cd /var/www/danbooru2/current ; bundle exec ruby script/donmai/backup_db_to_s3"
   command "cd /var/www/danbooru2/current ; script/donmai/prune_backup_dbs"
 end
 
-every 1.day, :at => "3:00 am" do
-  command "psql --set-statement-timeout=0 -hdbserver -c \"vacuum analyze verbose;\" danbooru2"
+every 1.day, :at => "2:00 am" do
+  command "psql --set statement_timeout=0 -hdbserver -c \"vacuum analyze verbose;\" danbooru2"
 end
 
 if environment == "production"