Merge branch 'dev' into test

app.py

@@ -1,10 +1,12 @@
 import random
-
-from gevent import monkey
-monkey.patch_all()
-
+import os
+import logging
 import json
 import time
+import traceback
+import ast
+from gevent import monkey
+monkey.patch_all()
 
 from flask import Flask, request
 from log import Log
@@ -13,17 +15,29 @@ from recommend import video_homepage_recommend, video_relevant_recommend
 from category import get_category_videos
 from video_recall import PoolRecall
 from db_helper import RedisHelper
-import traceback
-import ast
 from gevent.pywsgi import WSGIServer
 from multiprocessing import cpu_count, Process
 from utils import update_video_w_h_rate
 from user2new import user2new
 from params_helper import Params
 # from werkzeug.middleware.profiler import ProfilerMiddleware
+from geventwebsocket.handler import WebSocketHandler
 
 
+logging.basicConfig(level=logging.DEBUG,  # 控制台打印的日志级别
+                    filename=os.path.join(os.path.dirname(os.path.realpath(__file__)), "logs", 'app.log'),  # 将日志写入log_new.log文件中
+                    filemode='w',  # 模式，有w和a，w就是写模式，每次都会重新写日志，覆盖之前的日志 a是追加模式，默认如果不写的话，就是追加模式
+                    format="%(asctime)s:%(levelname)s:%(name)s -- %(message)s", datefmt="%Y/%m/%d %H:%M:%S"  # 日志格式
+                    )
+
 app = Flask(__name__)
+
+# handler = logging.FileHandler('app.log', encoding='utf-8')
+# logging_format = logging.Formatter('%(asctime)s - %(levelname)s - %(filename)s- %(funcName)s - %(lineno): %(message)s')
+# handler.setFormatter(logging_format)
+# app.logger.setLevel(logging.DEBUG)
+# app.logger.addHandler(handler)
+
 #app.wsgi_app = ProfilerMiddleware(app.wsgi_app)
 log_ = Log()
 config_ = set_config()
@@ -268,7 +282,7 @@ def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
     if MULTI_PROCESS == False:
         WSGIServer((ip, port), app).serve_forever()
     else:
-        mulserver = WSGIServer((ip, port), app)
+        mulserver = WSGIServer((ip, port), app, handler_class=WebSocketHandler)
         mulserver.start()
  
         def server_forever():
@@ -276,14 +290,14 @@ def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
             mulserver._stop_event.wait()
  
         #for i in range(cpu_count()):
-        for i in range(4):
+        for i in range(16):
             p = Process(target=server_forever)
             p.start()
 
 
 if __name__ == '__main__':
     
-    #app.run()
+    # app.run(debug=True)
     #server = pywsgi.WSGIServer(('0.0.0.0', 5000), app)
     #server.serve_forever()
     apprun()

recommend.py

@@ -510,17 +510,17 @@ def get_recommend_params(ab_exp_info, page_type=0):
         #     rule_key = config_.RULE_KEY_REGION['region_rule_rank1']
         #     no_op_flag = True
 
-        elif config_.AB_EXP_CODE['24h_rule_rank1'] in ab_exp_code_list:
-            ab_code = config_.AB_CODE['rank_by_24h'].get('24h_rule_rank1')
-            expire_time = 3600
-            rule_key = config_.RULE_KEY_24H['24h_rule_rank1']
-            no_op_flag = True
+        # elif config_.AB_EXP_CODE['24h_rule_rank1'] in ab_exp_code_list:
+        #     ab_code = config_.AB_CODE['rank_by_24h'].get('24h_rule_rank1')
+        #     expire_time = 3600
+        #     rule_key = config_.RULE_KEY_24H['24h_rule_rank1']
+        #     no_op_flag = True
 
-        elif config_.AB_EXP_CODE['24h_rule_rank2'] in ab_exp_code_list:
-            ab_code = config_.AB_CODE['rank_by_24h'].get('24h_rule_rank2')
-            expire_time = 3600
-            rule_key = config_.RULE_KEY_24H['24h_rule_rank2']
-            no_op_flag = True
+        # elif config_.AB_EXP_CODE['24h_rule_rank2'] in ab_exp_code_list:
+        #     ab_code = config_.AB_CODE['rank_by_24h'].get('24h_rule_rank2')
+        #     expire_time = 3600
+        #     rule_key = config_.RULE_KEY_24H['24h_rule_rank2']
+        #     no_op_flag = True
 
         # elif config_.AB_EXP_CODE['region_rule_rank2'] in ab_exp_code_list:
         #     ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank2')