Merge pull request #5019 from tomhughes/oauth2-cleanup

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index 72a6dec9bcd258c87adc1bef62c52cc6f375c6d3..e829be176b9ece957a1a36a87db9942717c27ebf 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -1,28 +1,12 @@
 #!/usr/bin/env ruby
 
 #!/usr/bin/env ruby
 

-require File.dirname(__FILE__) + '/../config/environment'
+require File.join(File.dirname(__FILE__), "..", "config", "environment")

 
 

-last_session_id = 0
+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

 
 

-begin
-  sessions = Session.find(:all,
-                          :conditions => ["updated_at < ? and id > ?", 1.week.ago, last_session_id],
-                          :order => :id, :limit => 1000)
+Doorkeeper::AccessGrant.where("revoked_at < NOW() - INTERVAL '28 days' OR (created_at + expires_in * INTERVAL '1 second') < NOW() - INTERVAL '28 days'").delete_all
+Doorkeeper::AccessToken.where("revoked_at < NOW() - INTERVAL '28 days' OR (created_at + expires_in * INTERVAL '1 second') < NOW() - INTERVAL '28 days'").delete_all

 
 

-  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()")
+exit 0