Merge branch 'region-h-ab' into test

app.py

@@ -299,7 +299,7 @@ def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
 
 if __name__ == '__main__':
     
-    # app.run(debug=True)
+    app.run()
     #server = pywsgi.WSGIServer(('0.0.0.0', 5000), app)
     #server.serve_forever()
-    apprun()
+    # apprun()

config.py

@@ -41,6 +41,9 @@ class BaseConfig(object):
         'whole_movies': '063',
         'region_rule_rank3_appType_5': '068',
         'region_rule_rank3_appType_19': '069',
+        'region_rule_rank3_appType_4': '072',
+        'region_rule_rank3_appType_6': '073',
+        'region_rule_rank3_appType_18': '074',
     }
 
     # abTest

gunicorn.config.py

@@ -0,0 +1,14 @@
+import os
+# 日志配置
+# 本地日志存储路径
+log_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "logs")
+if not os.path.exists(log_path):
+    os.makedirs(log_path)
+loglevel = "info"
+accesslog = os.path.join(log_path, 'access.log')
+errorlog = os.path.join(log_path, 'error.log')
+
+workers = 5
+# 设置工作模式为协程
+worker_class = "gevent"
+bind = "0.0.0.0:5001"

recommend.py

@@ -190,7 +190,7 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
              gevent.spawn(pool_recall.flow_pool_recall, size)]
     # 地域分组实验
     elif ab_code in [code for _, code in config_.AB_CODE['region_rank_by_h'].items()]:
-        if app_type == config_.APP_TYPE['ZUI_JING_QI']:
+        if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
             t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
         else:
             t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
@@ -533,7 +533,10 @@ def get_recommend_params(ab_exp_info, page_type=0):
 
         elif config_.AB_EXP_CODE['region_rule_rank3'] in ab_exp_code_list or\
                 config_.AB_EXP_CODE['region_rule_rank3_appType_5'] in ab_exp_code_list or\
-                config_.AB_EXP_CODE['region_rule_rank3_appType_19'] in ab_exp_code_list:
+                config_.AB_EXP_CODE['region_rule_rank3_appType_19'] in ab_exp_code_list or\
+                config_.AB_EXP_CODE['region_rule_rank3_appType_4'] in ab_exp_code_list or\
+                config_.AB_EXP_CODE['region_rule_rank3_appType_6'] in ab_exp_code_list or\
+                config_.AB_EXP_CODE['region_rule_rank3_appType_18'] in ab_exp_code_list:
             ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank3')
             expire_time = 3600
             rule_key = config_.RULE_KEY_REGION['region_rule_rank3']