Merge remote-tracking branch 'origin/master'

celery_stats/celery_stats_monitor.py

@@ -19,6 +19,8 @@ token_dict = {
                                'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
     "graces-es6-tapir-service": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
                                  'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
+    "graces-es6-tapir-service_pre": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
+                                 'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
     "graces-es6-tapir-doctor": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
                                  'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
     "mentha-tapir-answer": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
@@ -27,6 +29,8 @@ token_dict = {
                            'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
     "graces-es6-tapir-lbs": {'secret': "SECa54a42411200fd7c642921c35b7d0fe5a71c93e7305091413292bb6cc6cb318c",
                            'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
+    "graces-es6-tapir-merchant": {'secret': "SECa54a42411200fd7c642921c35b7d0fe5a71c93e7305091413292bb6cc6cb318c",
+                           'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
     "mentha-tapir-tractate": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
                               'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
 }
@@ -74,7 +78,7 @@ def len_list_and_send_msg(redis_clint, key_name, rules, per_sec=10):
     # print(key_name,res)
     str_res = rules.parse(key_name, res, per_sec=per_sec)
     if str_res:
-        if key_name in ["graces-tapir-card","graces-es6-tapir-lbs"]:
+        if key_name in ["graces-tapir-card","graces-es6-tapir-lbs","graces-es6-tapir-merchant"]:
             send_msg_to_dingtalk(str_res, mobiles=["19566173658"], secret=token_dict[key_name]['secret'],
                                  access_token=token_dict[key_name]['access_token'])
         else:
@@ -91,10 +95,12 @@ if __name__ == "__main__":
         "mimas-dbmw": redis_old_mimas,
         "graces-es6-tapir-diary": redis_new_gaia,
         "graces-es6-tapir-service": redis_new_gaia,
+        "graces-es6-tapir-service_pre": redis_new_gaia,
         "graces-es6-tapir-doctor": redis_new_gaia,
         "mentha-tapir-answer": redis_new_mimas,
         "graces-tapir-card":redis_new_gaia,
         "graces-es6-tapir-lbs": redis_new_gaia,
+        "graces-es6-tapir-merchant": redis_new_gaia,
         "mentha-tapir-tractate": redis_new_mimas,
     }
     per_sec = 60 * 5