Mercurial > public > sg101

diff gpp/antispam/decorators.py @ 479:32cec6cd8808

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor RateLimiter so that if Redis is not running, everything still runs normally (minus the rate limiting protection). My assumption that creating a Redis connection would throw an exception if Redis wasn't running was wrong. The exceptions actually occur when you issue a command. This is for #224.
author Brian Neal <bgneal@gmail.com>
date Sun, 25 Sep 2011 00:49:05 +0000
parents 5e826e232932
children a5d11471d031
line wrap: on
line diff
--- a/gpp/antispam/decorators.py	Sun Sep 11 19:50:59 2011 +0000
+++ b/gpp/antispam/decorators.py	Sun Sep 25 00:49:05 2011 +0000
@@ -21,20 +21,24 @@
             ip = request.META.get('REMOTE_ADDR')
             try:
                 rate_limiter = RateLimiter(ip, count, interval, lockout)
+                if rate_limiter.is_blocked():
+                    return render(request, 'antispam/blocked.html', status=403)
+
             except RateLimiterUnavailable:
                 # just call the function and return the result
                 return fn(request, *args, **kwargs)
 
-            if rate_limiter.is_blocked():
-                return render(request, 'antispam/blocked.html', status=403)
-
             response = fn(request, *args, **kwargs)
 
             if request.method == 'POST':
                 success = (response and response.has_header('location') and
                         response.status_code == 302)
-                if not success and rate_limiter.incr():
-                    return render(request, 'antispam/blocked.html', status=403)
+                try:
+                    if not success and rate_limiter.incr():
+                        return render(request, 'antispam/blocked.html', status=403)
+
+                except RateLimiterUnavailable:
+                    pass
 
             return response