merge

physical/celery.py

@@ -12,7 +12,15 @@ app = Celery('physical')
 # the configuration object to child processes.
 # - namespace='CELERY' means all celery-related configuration keys
 #   should have a `CELERY_` prefix.
-app.conf.ONCE.config_from_object('django.conf:settings', namespace='CELERY')
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.conf.ONCE = {
+  'backend': 'celery_once.backends.Redis',
+  'settings': {
+    'url': settings.CELERY_BROKER_URL,
+    'default_timeout': 60 * 60
+  }
+}
+
 
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()

vest/request/auto_request.py

@@ -115,7 +115,7 @@ def logins(user_id):
         return None
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True})
+@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
 def click(cookies_get, id):
     # 点赞
     try:
@@ -149,7 +149,7 @@ def click(cookies_get, id):
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True})
+@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
 def reply(cookies_get, id, content):
     try:
         post_dict = {
@@ -273,7 +273,7 @@ def get_comments():
         return None
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True})
+@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
 def follow(cookies_get, id):
     try:
         post_dict = {
@@ -439,7 +439,7 @@ def set_reply_to_redis():
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True})
+@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
 def reply2(cookies_get, id, content, replied_id):
     try:
         post_dict = {
@@ -460,7 +460,7 @@ def reply2(cookies_get, id, content, replied_id):
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True})
+@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
 def pictorial_reply(cookies_get, id, content):
     try:
         post_dict = {