Merge branch 'master' of http://101.200.220.49:8001/houxiaohua/shop_live_scraper

douyin_user_scraper_in.py

@@ -92,13 +92,12 @@ def scraper():
             print('thrend_' + threading.current_thread().name + ' finish')
             break
 
-        ullen = redisDyModel.llen(uKey)
-        if ullen == 0:
+        user_id = redisDyModel.rpop(uKey)
+        if not user_id:
             time.sleep(2)
             continue
 
         str_time = time.strftime("%H:%M:%S", time.localtime())
-        user_id = redisDyModel.rpop(uKey)
 
         try:
             proxy = get_scraper_proxy(pKey)

douyin_video_scraper_web.py

@@ -280,7 +280,7 @@ def scrape():
 
     except Exception as e:
         set_score('fail')
-        # rds.push_request_id(sec_user_id)
+        rds.push_request_id(sec_user_id)
         print(
             time.strftime("%H:%M:%S", time.localtime()) 
             + ' '