From 2af59642f6e6b61c3065236bec5754a01ac98d59 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 17 Feb 2013 23:16:56 -0500
Subject: [PATCH] clean up job listing, bug fixes

---
 app/controllers/delayed_jobs_controller.rb | 2 +-
 app/models/post.rb                         | 4 ++--
 app/presenters/upload_presenter.rb         | 2 +-
 app/views/delayed_jobs/index.html.erb      | 4 +++-
 config/environments/production.rb          | 2 +-
 config/schedule.rb                         | 4 ++++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/controllers/delayed_jobs_controller.rb b/app/controllers/delayed_jobs_controller.rb
index 90d6f03c3..a8571db9c 100644
--- a/app/controllers/delayed_jobs_controller.rb
+++ b/app/controllers/delayed_jobs_controller.rb
@@ -1,5 +1,5 @@
 class DelayedJobsController < ApplicationController
   def index
-    @delayed_jobs = Delayed::Job.order("created_at desc").paginate(params[:page])
+    @delayed_jobs = Delayed::Job.where("handler not like ? and handler not like ?", "%method_name: :update_related%", "%method_name: :process!%").order("created_at desc").paginate(params[:page])
   end
 end
diff --git a/app/models/post.rb b/app/models/post.rb
index 4326674d5..8f32d8fac 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -532,14 +532,14 @@ class Post < ActiveRecord::Base
     def add_pool!(pool)
       return if belongs_to_pool?(pool)
       self.pool_string = "#{pool_string} pool:#{pool.id}".strip
-      update_column(:pool_string, pool_string)
+      update_column(:pool_string, pool_string) unless new_record?
       pool.add!(self)
     end
     
     def remove_pool!(pool)
       return unless belongs_to_pool?(pool)
       self.pool_string = pool_string.gsub(/(?:\A| )pool:#{pool.id}(?:\Z| )/, " ").strip
-      update_column(:pool_string, pool_string)
+      update_column(:pool_string, pool_string) unless new_record?
       pool.remove!(self)
     end
   end
diff --git a/app/presenters/upload_presenter.rb b/app/presenters/upload_presenter.rb
index 085e2fa85..dc7a62ce2 100644
--- a/app/presenters/upload_presenter.rb
+++ b/app/presenters/upload_presenter.rb
@@ -6,7 +6,7 @@ class UploadPresenter < Presenter
   def status(template)
     case @upload.status
     when /duplicate: (\d+)/
-      template.link_to(@upload.status, template.__send__(:post_path, $1))
+      template.link_to(@upload.status.gsub(/error: RuntimeError - /, ""), template.__send__(:post_path, $1))
       
     else
       @upload.status
diff --git a/app/views/delayed_jobs/index.html.erb b/app/views/delayed_jobs/index.html.erb
index cdd356679..00e0ca092 100644
--- a/app/views/delayed_jobs/index.html.erb
+++ b/app/views/delayed_jobs/index.html.erb
@@ -3,6 +3,7 @@
 <table class="striped" width="100%">
   <thead>
     <tr>
+      <th>ID</th>
       <% if CurrentUser.is_admin? %>
         <th>Handler</th>
       <% end %>
@@ -16,8 +17,9 @@
   <tbody>
     <% @delayed_jobs.each do |job| %>
       <tr>
+        <td><%= job.id %></td>
         <% if CurrentUser.is_admin? %>
-          <td><%= job.handler %></td>
+          <td><%= job.handler[:method_name] %></td>
         <% end %>
         <td><%= job.attempts %></td>
         <td><%= job.priority %></td>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index acd030ea5..7948739ab 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -31,7 +31,7 @@ Danbooru::Application.configure do
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
-  config.log_level = :info
+  config.log_level = :error
 
   # Prepend all log lines with the following tags
   # config.log_tags = [ :subdomain, :uuid ]
diff --git a/config/schedule.rb b/config/schedule.rb
index ccf46b29a..e9af4e59f 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -8,6 +8,10 @@ every 1.day do
   runner "PostPruner.new.prune!"
 end
 
+every 1.day do
+  runner "Upload.delete_all(['created_at < ?', 1.day.ago])"
+end
+
 if environment == "production"
   every 1.hour do
     runner "AmazonBackup.execute"