Merge branch 'wsy3' into 'master'

使用redis incr 修复celery 重复下发问题

See merge request !575

vest/request/auto_request.py

@@ -116,13 +116,14 @@ def logins(user_id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def click(cookies_get, id):
-    click_key = 'click topic_id:%s, cookies_get: %s' % (str(cookies_get), str(id))
-    cache_count = click_cache.get(click_key)
-    if cache_count:
-        return
-    else:
-        click_cache.set(click_key, 1)
+    try:
+        click_key = 'click topic_id:%s, cookies_get: %s' % (str(cookies_get), str(id))
+        cache_count = click_cache.inrc(click_key, 1)
         click_cache.expire(click_key, settings.CACHE_SECONDS)
+        if cache_count > 1:
+            return
+    except:
+        return
 
     # 点赞
     try:
@@ -158,13 +159,15 @@ def click(cookies_get, id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def reply(cookies_get, id, content):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
-    cache_count = reply_cache.get(reply_key)
-    if cache_count:
-        return
-    else:
-        reply_cache.set(reply_key, 1)
+    try:
+        reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
+        cache_count = click_cache.inrc(reply_key, 1)
         reply_cache.expire(reply_key, settings.CACHE_SECONDS)
+        if cache_count > 1:
+            return
+    except:
+        return
+
     try:
         post_dict = {
             'topic_id': id,
@@ -289,13 +292,15 @@ def get_comments():
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def follow(cookies_get, id):
-    follow_key = 'click user_id:%s, cookies_get: %s' % (str(id), str(cookies_get))
-    cache_count = follow_cache.get(follow_key)
-    if cache_count:
-        return
-    else:
-        follow_cache.set(follow_key, 1)
+    try:
+        follow_key = 'click user_id:%s, cookies_get: %s' % (str(id), str(cookies_get))
+        cache_count = click_cache.inrc(follow_key, 1)
         follow_cache.expire(follow_key, settings.CACHE_SECONDS)
+        if cache_count > 1:
+            return
+    except:
+        return
+
     try:
         post_dict = {
             'type': 1,
@@ -462,14 +467,16 @@ def set_reply_to_redis():
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def reply2(cookies_get, id, content, replied_id):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s, replied_id: %s' % \
-                (str(id), str(cookies_get), str(content), str(replied_id))
-    cache_count = reply_cache.get(reply_key)
-    if cache_count:
-        return
-    else:
-        reply_cache.set(reply_key, 1)
+    try:
+        reply_key = 'click topic_id:%s, cookies_get: %s, content:%s, replied_id: %s' % \
+                    (str(id), str(cookies_get), str(content), str(replied_id))
+        cache_count = click_cache.inrc(reply_key, 1)
         reply_cache.expire(reply_key, settings.CACHE_SECONDS)
+        if cache_count > 1:
+            return
+    except:
+        return
+
     try:
         post_dict = {
             'topic_id': id,
@@ -491,13 +498,15 @@ def reply2(cookies_get, id, content, replied_id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def pictorial_reply(cookies_get, id, content):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
-    cache_count = reply_cache.get(reply_key)
-    if cache_count:
-        return
-    else:
-        reply_cache.set(reply_key, 1)
+    try:
+        reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
+        cache_count = click_cache.inrc(reply_key, 1)
         reply_cache.expire(reply_key, settings.CACHE_SECONDS)
+        if cache_count > 1:
+            return
+    except:
+        return
+
     try:
         post_dict = {
             'pictorial_id': id,