华为推送添加打印

Service/HuaweiPushService/HuaweiPushService.py

@@ -1,6 +1,6 @@
 import json
-import logging
 
+from AnsjerPush.config import LOGGER
 from Service.HuaweiPushService import push_admin
 from Service.HuaweiPushService.push_admin import messaging
 
@@ -34,16 +34,15 @@ class HuaweiPushObject:
         @param appBundleId: APP包id
         @return:
         """
-        logger = logging.getLogger('info')
-        logger.info(
+        LOGGER.info(
             '华为推送参数: token_val:{}, msg_title:{}, msg_text:{}, image_url:{}, uid:{}, event_type:{}, n_time:{}'.format(
                 token_val, msg_title, msg_text, image_url, uid, event_type, n_time))
 
-        self.send_notify_message(msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val, logger)
+        self.send_notify_message(msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val)
         if int(event_type) == 606:
-            self.send_data_message(uid, event_type, n_time, token_val, logger)
+            self.send_data_message(uid, event_type, n_time, token_val)
 
-    def send_notify_message(self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val, logger):
+    def send_notify_message(self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val):
         """
         发送通知推送
         @param msg_title:
@@ -54,9 +53,9 @@ class HuaweiPushObject:
         @param event_type:
         @param n_time:
         @param token_val:
-        @param logger:
         @return: None
         """
+        LOGGER.info('{}进入发送通知推送函数'.format(uid))
         msg_title = '设备昵称: {}'.format(msg_title)
         notification = messaging.Notification(
             title=msg_title,
@@ -93,22 +92,22 @@ class HuaweiPushObject:
         try:
             import certifi
             response = messaging.send_message(message, verify_peer=certifi.where())
-            logger.info('华为通知推送响应: {}'.format(json.dumps(vars(response))))
+            LOGGER.info('{}华为通知推送响应: {}'.format(uid, json.dumps(vars(response))))
             assert (response.code == '80000000')
         except Exception as e:
-            logger.info('华为通知推送异常: {}'.format(repr(e)))
+            LOGGER.info('华为通知推送异常: {}'.format(repr(e)))
 
     @staticmethod
-    def send_data_message(uid, event_type, n_time, token_val, logger):
+    def send_data_message(uid, event_type, n_time, token_val):
         """
         发送透传推送
         @param uid:
         @param event_type:
         @param n_time:
         @param token_val:
-        @param logger:
         @return: None
         """
+        LOGGER.info('{}进入发送透传推送函数'.format(uid))
         data = {'uid': uid, 'event_type': event_type, 'event_time': n_time}
         data = json.dumps(data)
         android = messaging.AndroidConfig(
@@ -127,10 +126,10 @@ class HuaweiPushObject:
         try:
             import certifi
             response = messaging.send_message(message, verify_peer=certifi.where())
-            logger.info('华为透传推送响应: {}'.format(json.dumps(vars(response))))
+            LOGGER.info('{}华为透传推送响应: {}'.format(uid, json.dumps(vars(response))))
             assert (response.code == '80000000')
         except Exception as e:
-            logger.info('华为透传推送异常: {}'.format(repr(e)))
+            LOGGER.info('华为透传推送异常: {}'.format(repr(e)))
 
     @staticmethod
     def android_notification(msg_title, msg_text, intent):