diff --git a/isso.ini b/isso.ini index fcdf194..0e41f58 100644 --- a/isso.ini +++ b/isso.ini @@ -3,7 +3,6 @@ http = :8080 master = true processes = 4 spooler = %v/mail -queue = 1 module = isso virtualenv = . env = ISSO_SETTINGS=%v/sample.cfg diff --git a/isso/core.py b/isso/core.py index 3e5a8f4..3a606a0 100644 --- a/isso/core.py +++ b/isso/core.py @@ -197,13 +197,10 @@ class uWSGIMixin(Mixin): class Lock(): def __enter__(self): - while uwsgi.queue_get(0) == "LOCK": - time.sleep(0.01) - - uwsgi.queue_set(0, "LOCK") + uwsgi.lock() def __exit__(self, exc_type, exc_val, exc_tb): - uwsgi.queue_pop() + uwsgi.unlock() def spooler(args): try: diff --git a/isso/views/comment.py b/isso/views/comment.py index 58b98c0..f204b19 100644 --- a/isso/views/comment.py +++ b/isso/views/comment.py @@ -70,23 +70,20 @@ def new(app, environ, request, uri): data['mode'] = (app.conf.getboolean('moderation', 'enabled') and 2) or 1 data['remote_addr'] = utils.anonymize(str(request.remote_addr)) - # extract site's