Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical into like-pre/r01

linucb/views/collect_data.py

@@ -236,15 +236,15 @@ class CollectData(object):
             device_tag_ctr = LikeDeviceTagStat.objects.using(settings.SLAVE1_DB_NAME).filter(
                 device_id=device_id, tag_id=tag_id).values("tag_ctr_30")
             if device_tag_ctr:
-                device_tag_ctr_value = device_tag_ctr[0].get("tag_ctr_30", 0.0)
+                device_tag_ctr_value = device_tag_ctr[0].get("tag_ctr_30", 0.001)
             else:
-                device_tag_ctr_value = 0.0
+                device_tag_ctr_value = 0.001
             logging.info("get_device_tag_ctr" + str(device_id) + str(tag_id))
             return device_tag_ctr_value
         except:
             logging_exception()
             logging.error("get_device_tag_ctr error!")
-            return 0.0
+            return 0.001
 
     def consume_data_from_kafka(self,topic_name=None):
         try:

vest/request/auto_request.py

@@ -115,7 +115,8 @@ def logins(user_id):
         return None
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+# @shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+@shared_task(retry_kwargs={'max_retries': 0})
 def click(cookies_get, id):
     # 点赞
     try:
@@ -149,7 +150,8 @@ 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, 'unlock_before_run': True})
+# @shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+@shared_task(retry_kwargs={'max_retries': 0})
 def reply(cookies_get, id, content):
     try:
         post_dict = {
@@ -273,7 +275,8 @@ def get_comments():
         return None
 
 
-@shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+# @shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+@shared_task(retry_kwargs={'max_retries': 0})
 def follow(cookies_get, id):
     try:
         post_dict = {
@@ -439,7 +442,8 @@ 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, 'unlock_before_run': True})
+# @shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+@shared_task(retry_kwargs={'max_retries': 0})
 def reply2(cookies_get, id, content, replied_id):
     try:
         post_dict = {
@@ -460,7 +464,8 @@ 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, 'unlock_before_run': True})
+# @shared_task(retry_kwargs={'max_retries': 0}, base=QueueOnce, once={'graceful': True, 'unlock_before_run': True})
+@shared_task(retry_kwargs={'max_retries': 0})
 def pictorial_reply(cookies_get, id, content):
     try:
         post_dict = {