diff --git a/engine/apps/mobile_app/tasks.py b/engine/apps/mobile_app/tasks.py index 91e390c4..d2c64dbf 100644 --- a/engine/apps/mobile_app/tasks.py +++ b/engine/apps/mobile_app/tasks.py @@ -62,7 +62,7 @@ def send_push_notification_to_fcm_relay(message: Message) -> requests.Response: def _send_push_notification( device_to_notify: FCMDevice, message: Message, error_cb: typing.Optional[typing.Callable[..., None]] = None ) -> None: - logger.debug(f"Sending push notification with message: {message}") + logger.debug(f"Sending push notification to device type {device_to_notify.type} with message: {message}") def _error_cb(): if error_cb: diff --git a/engine/engine/middlewares.py b/engine/engine/middlewares.py index 04af088a..83ca2bf6 100644 --- a/engine/engine/middlewares.py +++ b/engine/engine/middlewares.py @@ -23,20 +23,18 @@ class RequestTimeLoggingMiddleware(MiddlewareMixin): seconds = (dt - request._logging_start_dt).total_seconds() status_code = 0 if response is None else response.status_code content_length = request.headers.get("content-length", default=0) + user_agent = request.META.get("HTTP_USER_AGENT", "unknown") message = ( "inbound " f"latency={str(seconds)} status={status_code} method={request.method} path={request.path} " - f"content-length={content_length} slow={int(seconds > settings.SLOW_THRESHOLD_SECONDS)} " + f"user_agent={user_agent} content-length={content_length} " + f"slow={int(seconds > settings.SLOW_THRESHOLD_SECONDS)} " ) - if ( - hasattr(request, "user") - and request.user - and request.user.id - and hasattr(request.user, "organization_id") - ): + if hasattr(request, "user") and request.user and request.user.id and hasattr(request.user, "organization"): user_id = request.user.id - org_id = request.user.organization_id - message += f"user_id={user_id} org_id={org_id} " + org_id = request.user.organization.id + org_slug = request.user.organization.org_slug + message += f"user_id={user_id} org_id={org_id} org_slug={org_slug} " if request.path.startswith("/integrations/v1"): split_path = request.path.split("/") integration_type = split_path[3]