From 9aff0f840c949449b58066f9d567322c0f7f3730 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 4 Apr 2013 18:15:13 -0400
Subject: [PATCH] consolidate cronjobs

---
 app/logical/daily_maintenance.rb  | 1 +
 app/logical/weekly_maintenance.rb | 2 ++
 config/schedule.rb                | 9 +--------
 script/donmai/backup_db           | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/logical/daily_maintenance.rb b/app/logical/daily_maintenance.rb
index a3d3d6e9d..129224e91 100644
--- a/app/logical/daily_maintenance.rb
+++ b/app/logical/daily_maintenance.rb
@@ -1,5 +1,6 @@
 class DailyMaintenance
   def run
+    ActiveRecord::Base.connection.execute("set statement_timeout = 0")
     PostPruner.new.prune!
     TagPruner.new.prune!
     Upload.delete_all(['created_at < ?', 1.day.ago])
diff --git a/app/logical/weekly_maintenance.rb b/app/logical/weekly_maintenance.rb
index fc9528c51..4b97ad8bb 100644
--- a/app/logical/weekly_maintenance.rb
+++ b/app/logical/weekly_maintenance.rb
@@ -1,5 +1,7 @@
 class DailyMaintenance
   def run
+    ActiveRecord::Base.connection.execute("set statement_timeout = 0")
     ApiCacheGenerator.new.generate_tag_cache
+    UserPasswordResetNonce.prune!
   end
 end
diff --git a/config/schedule.rb b/config/schedule.rb
index d3ffa874a..3a8cb63f5 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -12,22 +12,15 @@ every 1.day, :at => "1: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"
+  command "psql --set statement_timeout=0 -hdbserver -c \"vacuum analyze;\" danbooru2"
 end
 
 every 1.week, :at => "1:30 am" do
   runner "WeeklyMaintenance.new.run"
 end
 
-every 8.hours do
-  command "psql --set statement_timeout=0 -hdbserver -c \"vacuum analyze;\" danbooru2"
-end
-
 if environment == "production"
   every 1.hour do
     runner "AmazonBackup.execute"
   end
-
-  every 1.week do
-    runner "UserPasswordResetNonce.prune!"
-  end
 end
diff --git a/script/donmai/backup_db b/script/donmai/backup_db
index e132328ce..e31195e3c 100755
--- a/script/donmai/backup_db
+++ b/script/donmai/backup_db
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PGOPTIONS="-c statement_timeout=0" pg_dump -Fc -hdbserver -f /var/www/danbooru2/shared/backup/db-`date +"%Y-%m-%d-%H-%M"`.dump danbooru2
+pg_dump --set statement_timeout=0 -Fc -hdbserver -f /var/www/danbooru2/shared/backup/db-`date +"%Y-%m-%d-%H-%M"`.dump danbooru2