断言异常不发邮件,内容添加服务器配置信息

Service/PushService.py

@@ -17,7 +17,7 @@ import requests
 from pyfcm import FCMNotification
 
 from AnsjerPush.config import APP_BUNDLE_DICT, APNS_MODE, BASE_DIR, APNS_CONFIG, FCM_CONFIG, JPUSH_CONFIG, XMPUSH_CONFIG \
-    , VIVOPUSH_CONFIG, OPPOPUSH_CONFIG, MEIZUPUSH_CONFIG
+    , VIVOPUSH_CONFIG, OPPOPUSH_CONFIG, MEIZUPUSH_CONFIG, CONFIG_INFO
 from Model.models import UidPushModel
 from Object.S3Email import S3Email
 from Service.CommonService import CommonService
@@ -133,9 +133,11 @@ class PushObject:
             res = cli.push(n=n, device_token=token_val, topic=app_bundle_id)
             logger.info('IOS推送响应状态码{},params,uid:{},{}'.format(res.status_code, uid, json.dumps(push_data)))
             assert res.status_code == 200
+        except AssertionError:
+            pass
         except Exception as e:
-            logger.info('--->IOS推送异常{}'.format(repr(e)))
-            email_content = 'IOS推送异常: {}'.format(repr(e))
+            logger.info('IOS推送异常{}'.format(repr(e)))
+            email_content = '{}服IOS推送异常: {}'.format(CONFIG_INFO, repr(e))
             S3Email().send_email(email_content, 'servers@ansjer.com')
 
     @staticmethod