Merge remote-tracking branch 'upstream/pull/2505'

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index 085c3aeef52e1fb94268de9f127a0c67e77eb840..10fdf9db7328dc1a3c1db8105d9345c0c42397d7 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -1,30 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.dirname(__FILE__) + "/../config/environment"
 
-last_session_id = 0
-
-begin
-  sessions = Session.find(:all,
-                          :conditions => ["updated_at < ? and id > ?", 1.week.ago, last_session_id],
-                          :order => :id, :limit => 1000)
-
-  sessions.each do |session|
-    last_session_id = session.id
-
-    begin
-      if session[:user] and User.find(session[:user])
-        session.destroy if session.updated_at < 1.month.ago
-      else
-        session.destroy
-      end
-    rescue Exception => ex
-      puts "Invalid session #{session.session_id}: #{ex.to_s}"
-      session.destroy
-    end
-  end
-end while sessions.length > 0
-
-UserToken.delete_all("expiry < NOW()")
+UserToken.where("expiry < NOW()").delete_all
+OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
 
 exit 0