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

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index 3eaeef7c6a739efa50ddb71f930cbb22c1869094..7601d35cf9386a276a1fabd7199a3e00a6cb9c23 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + "/../config/environment"
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
-UserToken.delete_all("expiry < NOW()")
-OauthNonce.delete_all("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')")
+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
 
 exit 0