1.1 --- a/src/main/kotlin/de/uapcore/lightpit/AbstractServlet.kt Sun Dec 12 18:16:46 2021 +0100
1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/AbstractServlet.kt Wed Dec 15 19:56:05 2021 +0100
1.3 @@ -34,7 +34,9 @@
1.4 import javax.servlet.http.HttpServletRequest
1.5 import javax.servlet.http.HttpServletResponse
1.6
1.7 -abstract class AbstractServlet : LoggingTrait, HttpServlet() {
1.8 +abstract class AbstractServlet : HttpServlet() {
1.9 +
1.10 + protected val logger = MyLogger()
1.11
1.12 /**
1.13 * Contains the GET request mappings.
1.14 @@ -68,7 +70,7 @@
1.15 Pair(PathPattern(requestPath), ::notFound)
1.16 } else {
1.17 if (candidates.size > 1) {
1.18 - logger().warn("Ambiguous mapping for request path '{}'", requestPath)
1.19 + logger.warn("Ambiguous mapping for request path '{0}'", requestPath)
1.20 }
1.21 candidates.entries.first().toPair()
1.22 }
1.23 @@ -82,7 +84,7 @@
1.24 ) {
1.25 val params = mapping.first.obtainPathParameters(sanitizedRequestPath(req))
1.26 val method = mapping.second
1.27 - logger().trace("invoke {}", method)
1.28 + logger.trace("invoke {0}", method)
1.29 method(HttpRequest(req, resp, params), dao)
1.30 }
1.31
1.32 @@ -105,13 +107,13 @@
1.33 val sessionLocale = if (availableLanguages.contains(reqLocale)) reqLocale else availableLanguages.first()
1.34 session.setAttribute(Constants.SESSION_ATTR_LANGUAGE, sessionLocale)
1.35 resp.locale = sessionLocale
1.36 - logger().debug(
1.37 - "Setting language for new session {}: {}", session.id, sessionLocale.displayLanguage
1.38 + logger.debug(
1.39 + "Setting language for new session {0}: {1}", session.id, sessionLocale.displayLanguage
1.40 )
1.41 } else {
1.42 val sessionLocale = session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) as Locale
1.43 resp.locale = sessionLocale
1.44 - logger().trace("Continuing session {} with language {}", session.id, sessionLocale)
1.45 + logger.trace("Continuing session {0} with language {1}", session.id, sessionLocale)
1.46 }
1.47
1.48 // set some internal request attributes
1.49 @@ -150,8 +152,8 @@
1.50 invokeMapping(findMapping(mappings, req), req, resp, dao)
1.51 connection.commit()
1.52 } catch (ex: SQLException) {
1.53 - logger().warn("Database transaction failed (Code {}): {}", ex.errorCode, ex.message)
1.54 - logger().debug("Details: ", ex)
1.55 + logger.warn("Database transaction failed (Code {0}): {1}", ex.errorCode, ex.message)
1.56 + logger.debug("Details: ", ex)
1.57 resp.sendError(
1.58 HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
1.59 "Unhandled Transaction Error - Code: " + ex.errorCode
1.60 @@ -160,8 +162,8 @@
1.61 }
1.62 }
1.63 } catch (ex: SQLException) {
1.64 - logger().error("Severe Database Exception (Code {}): {}", ex.errorCode, ex.message)
1.65 - logger().debug("Details: ", ex)
1.66 + logger.error("Severe Database Exception (Code {0}): {1}", ex.errorCode, ex.message)
1.67 + logger.debug("Details: ", ex)
1.68 resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Database Error - Code: " + ex.errorCode)
1.69 }
1.70 }
