internal 1.1.11__py3-none-any.whl → 1.1.12__py3-none-any.whl

internal/base_factory.py

@@ -19,7 +19,7 @@ from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME, CORR
 from .exception.base_exception import InternalBaseException
 from .exception.internal_exception import BadGatewayException, GatewayTimeoutException
 from .ext.amazon import aws
-from .http.requests import async_request
+from .http.requests import send_webhook_message
 from .http.responses import async_response
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
@@ -157,19 +157,11 @@ class BaseFactory(metaclass=ABCMeta):
             if isinstance(exc, BadGatewayException):
                 if self.get_app_config().WEBHOOK_BASE_URL:
                     message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                    await send_webhook_message(app, message)
             elif isinstance(exc, GatewayTimeoutException):
                 if self.get_app_config().WEBHOOK_BASE_URL:
                     message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                    await send_webhook_message(app, message)
 
             return await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
                                         status_code=exc.status_code)
@@ -187,13 +179,8 @@ class BaseFactory(metaclass=ABCMeta):
         async def http_exception_handler(request: Request, exc: Exception):
             app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
             app.state.logger.warn(traceback.format_exc())
-            if self.get_app_config().WEBHOOK_BASE_URL:
-                message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
-                payload = {"text": message}
-                try:
-                    await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                except Exception as e:
-                    app.state.logger.warn(f"Notify failure, Exception:{e}")
+            message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
+            await send_webhook_message(app, message)
 
             return await async_response(code="error_internal_server", message="Internal server error",
                                         status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)

{internal-1.1.11.dist-info → internal-1.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.11
+Version: 1.1.12
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.11.dist-info → internal-1.1.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/base_config.py,sha256=gbzgQklOzdQUY63b5k15dgk1sxVyYR4OcWXP0RHVNTI,2280
-internal/base_factory.py,sha256=DVWjOeCOURscykpm0MizOvT9PjbclpoVv92XySWMDkw,11353
+internal/base_factory.py,sha256=PUhPehpdB8wAUUm0QhbfzzIMeIL87ko8peIromoumnQ,10575
 internal/cache_redis.py,sha256=YMsrUXHd-wKjsjsboD79Y-ciBBowzT6aAjdJZ36-yEY,697
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/common_enum/contact_type.py,sha256=7QkTQ71UxpaT1YHI40FpjmLz3r-UbRU-sd0m5ajH1as,142
@@ -34,6 +34,6 @@ internal/model/base_model.py,sha256=hxleV8fYNvFgUoYmCv_inEP3kA4tD4HhCBCNFVK8SZg,
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=i6YZdiXsiWnOjRdlJ6afNCGpyMe3Uo9mhm3xlQBy3Ls,2824
 internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
-internal-1.1.11.dist-info/METADATA,sha256=62bJWUCU0Ty1dBYZ96QHuYpE8EzSQAqVgzsoOL76Mgk,939
-internal-1.1.11.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.11.dist-info/RECORD,,
+internal-1.1.12.dist-info/METADATA,sha256=F0VpGummXYYHUr1L5Hdc2TlI75Grti0PmKSMS7luE18,939
+internal-1.1.12.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.1.12.dist-info/RECORD,,