editstore 1.1.5 → 1.1.6

data/README.rdoc

@@ -160,7 +160,8 @@ In production, you can also use this task to clean out any rows that have been m
 	
 Use this task to clear out the unlocked druids from the object lock table.  Should be safe to run at any time.
 
-  rake editstore:prune_locks
+  rake editstore:prune_locks # prune any unlocked druids older than 1 month
+  rake editstore:prune_locks_all   # prune all unlocked druids
   
 Use this task to clear out the locked druids from the object lock table.  Should only be run if you are sure locks have hung and 
 there are no other processes running.
@@ -169,7 +170,9 @@ there are no other processes running.
 
 Use this task to clear out the any log run entries older than one month. Should be safe to run at any time if you don't need more than 1 month of run log history
 
-  rake editstore:prune_run_log
+  rake editstore:prune_run_log # prune any run logs older than 1 month and any run logs older than 24 hours with no activity
+  rake editstore:prune_run_log_all # prune any run logs that are not in process
+  
     	
 == Running Tests
 

data/app/models/editstore/object_lock.rb

@@ -2,12 +2,16 @@ module Editstore
   class ObjectLock < Connection
     attr_accessible :locked, :druid
   
-    def self.prune
-      self.destroy_all(:locked=>nil)
+    def self.prune_all
+      self.destroy_all(:locked=>nil) # anything that is not locked
     end  
     
+    def self.prune
+      self.where(:locked=>nil).where('updated_at < ?',1.month.ago).each {|obj| obj.destroy}  # anything that is not locked older than 1 month
+    end
+    
     def self.unlock_all
-      self.all_locked.each {|obj| obj.unlock}
+      self.all_locked.each {|obj| obj.unlock} # unlock anything that is locked
     end
     
     def self.get_pid(pid)

data/app/models/editstore/run_log.rb

@@ -1,8 +1,18 @@
 module Editstore
   class RunLog < Connection
-    attr_accessible :total_druids,:total_changes,:num_errors,:num_pending,:note
+    attr_accessible :started,:ended,:total_druids,:total_changes,:num_errors,:num_pending,:note
+    def self.currently_running
+      Editstore::RunLog.where(:ended=>nil).order('ended DESC')
+    end
+    def self.last_completed_run
+      Editstore::RunLog.where('ended IS NOT NULL').order('ended DESC').limit(1).first
+    end
     def self.prune
-      self.where('updated_at < ?',1.month.ago).each {|obj| obj.destroy}
+      self.where('updated_at < ?',1.month.ago).each {|obj| obj.destroy} # anything older than 1 month
+      self.where(:total_druids=>0).where('updated_at < ?',1.day.ago).each {|obj| obj.destroy} # anything older than 1 day with no activity
+    end
+    def self.prune_all
+      self.where('ended IS NOT NULL').each {|obj| obj.destroy} # anything that is done
     end
   end
 end                 

data/lib/editstore/version.rb

@@ -1,3 +1,3 @@
 module Editstore
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/tasks/editstore_tasks.rake

@@ -5,16 +5,26 @@ namespace :editstore do
     Editstore::Change.prune
   end
 
-  desc "Prune run log to remove entries over 1 month old"
+  desc "Prune run log to remove entries over 1 month old and entries with no activity over 1 day old"
   task :prune_run_log => :environment do
     Editstore::RunLog.prune
   end
+
+  desc "Prune run log to remove all completed entries"
+  task :prune_run_log_all => :environment do
+    Editstore::RunLog.prune_all
+  end
   
-  desc "Prune locked object tables to remove any unlocked druids"
+  desc "Prune locked object tables to remove any unlocked druids older than 1 month"
   task :prune_locks => :environment do
     Editstore::ObjectLock.prune
   end
 
+  desc "Prune locked object tables to remove all unlocked druids"
+  task :prune_locks_all => :environment do
+    Editstore::ObjectLock.prune_all
+  end
+
   desc "Remove all object locks for any druids"
   task :clear_locks => :environment do
     Editstore::ObjectLock.unlock_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: editstore
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4522800769409732582
+      hash: 2556779975228874083
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4522800769409732582
+      hash: 2556779975228874083
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24