Merge branch 'region-h-ab' into test

app.py

@@ -291,7 +291,7 @@ 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(24):
+        for i in range(20):
             p = Process(target=server_forever)
             p.start()
 

config.py

@@ -38,7 +38,8 @@ class BaseConfig(object):
         'region_rule_rank3': '055',
         'top_video_relevant_appType_19': '058',
         '24h_rule_rank2': '059',
-        'whole_movies': '063'
+        'whole_movies': '063',
+        'region_rule_rank3_appType_5': '068',
     }
 
     # abTest

recommend.py

@@ -528,7 +528,8 @@ def get_recommend_params(ab_exp_info, page_type=0):
         #     rule_key = config_.RULE_KEY_REGION['region_rule_rank2']
         #     no_op_flag = True
 
-        elif config_.AB_EXP_CODE['region_rule_rank3'] in ab_exp_code_list:
+        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:
             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']