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

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index 2708770965bb67979ffa0b3ce8221a35a0022c7f..67cc0705efa1e21ba8d42ef72eff1170b98853c8 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -1,18 +1,10 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
-Session.find(:all, :conditions => ["updated_at < ?", 1.week.ago]).each do |session|
-  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
+UserToken.where("expiry < NOW()").delete_all
+OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
+OauthToken.where("invalidated_at < NOW() - INTERVAL '28 days'").delete_all
+RequestToken.where("authorized_at IS NULL AND created_at < NOW() - INTERVAL '28 days'").delete_all
 
-UserToken.delete_all("expiry < NOW()")
+exit 0