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

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index d7f29239c70a57c0007adff01a64a4e1a242b0f2..67cc0705efa1e21ba8d42ef72eff1170b98853c8 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + "/../config/environment"
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
-UserToken.delete_all("expiry < NOW()")
+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
 
 exit 0