adapts hander in api-server

Author: pcrespov

services/api-server/src/simcore_service_api_server/services/log_streaming.py

@@ -8,6 +8,7 @@
 from models_library.rabbitmq_messages import LoggerRabbitMessage
 from models_library.users import UserID
 from pydantic import NonNegativeInt
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
 from servicelib.logging_utils import log_catch
 from servicelib.rabbitmq import RabbitMQClient
 from simcore_service_api_server.exceptions.backend_errors import BaseBackEndError
@@ -124,21 +125,23 @@ async def log_generator(self) -> AsyncIterable[str]:
                     yield log.json() + _NEW_LINE
                 except asyncio.TimeoutError:
                     done = await self._project_done()
+
         except BaseBackEndError as exc:
             _logger.info("%s", f"{exc}")
+
             yield ErrorGet(errors=[f"{exc}"]).json() + _NEW_LINE
+
         except Exception as exc:  # pylint: disable=W0718
             error_code = create_error_code(exc)
+            error_msg = MSG_INTERNAL_ERROR_USER_FRIENDLY_TEMPLATE + f" [{error_code}]"
+
             _logger.exception(
-                "Unexpected %s: %s",
-                exc.__class__.__name__,
-                f"{exc}",
-                extra={"error_code": error_code},
+                **create_troubleshotting_log_kwargs(
+                    error_msg,
+                    exception=exc,
+                )
             )
-            yield ErrorGet(
-                errors=[
-                    MSG_INTERNAL_ERROR_USER_FRIENDLY_TEMPLATE + f" (OEC: {error_code})"
-                ]
-            ).json() + _NEW_LINE
+            yield ErrorGet(errors=[error_msg]).json() + _NEW_LINE
+
         finally:
             await self._log_distributor.deregister(self._job_id)

services/web/server/src/simcore_service_webserver/login/handlers_confirmation.py

@@ -21,6 +21,7 @@
     parse_request_body_as,
     parse_request_path_parameters_as,
 )
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from simcore_postgres_database.errors import UniqueViolation
 from yarl import URL
@@ -179,17 +180,24 @@ async def validate_confirmation_and_redirect(request: web.Request):
 
         except Exception as err:  # pylint: disable=broad-except
             error_code = create_error_code(err)
+            front_end_msg = (
+                f"Sorry, we cannot confirm your {action}."
+                "Please try again in a few moments. "
+                f"If the problem persist please contact support attaching this code ({error_code})"
+            )
+
             _logger.exception(
-                "Failed during email_confirmation [%s]",
-                f"{error_code}",
-                extra={"error_code": error_code},
+                **create_troubleshotting_log_kwargs(
+                    front_end_msg,
+                    exception=err,
+                    tip="Failed during email_confirmation",
+                )
             )
+
             raise create_redirect_to_page_response(
                 request.app,
                 page="error",
-                message=f"Sorry, we cannot confirm your {action}."
-                "Please try again in a few moments. "
-                "If the problem persist please contact support attaching this code ({error_code})",
+                message=front_end_msg,
                 status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
             ) from err