Merge pull request #2290 from hongwei1/develop

refactor/enhanced the database error handling
OpenBankProject · Oct 10, 2023 · a867082 · a867082
2 parents 02039f9 + 116a7c8
commit a867082
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -696,23 +696,23 @@ class Boot extends MdcLoggable {
     })
 
     LiftRules.exceptionHandler.prepend{
-//      case(_, r, e) if tryo(DB.use(DefaultConnectionIdentifier){ conn => conn}.isClosed).getOrElse(true) => {
-//        logger.error("Exception being returned to browser when processing " + r.uri.toString, e)
-//        JsonResponse(
-//          Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.DatabaseConnectionClosedError}")),
-//          500
-//        )
-//      }
+      case(_, r, e) if e.isInstanceOf[NullPointerException] && e.getMessage.contains("Looking for Connection Identifier") => {
+        logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e)
+        JsonResponse(
+          Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.DatabaseConnectionClosedError}")),
+          500
+        )
+      }
       case(Props.RunModes.Development, r, e) => {
-        logger.error("Exception being returned to browser when processing " + r.uri.toString, e)
+        logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e)
         JsonResponse(
           Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.InternalServerError} ${showExceptionAtJson(e)}")),
           500
         )
       }
       case (_, r , e) => {
         sendExceptionEmail(e)
-        logger.error("Exception being returned to browser when processing " + r.uri.toString, e)
+        logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e)
         JsonResponse(
           Extraction.decompose(ErrorMessage(code = 500, message = s"${ErrorMessages.InternalServerError}")),
           500