1.1 --- a/src/main/kotlin/de/uapcore/lightpit/DataSourceProvider.kt Sun Dec 12 18:16:46 2021 +0100
1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/DataSourceProvider.kt Wed Dec 15 19:56:05 2021 +0100
1.3 @@ -38,7 +38,9 @@
1.4 * Provides access to the database.
1.5 */
1.6 @WebListener
1.7 -class DataSourceProvider : ServletContextListener, LoggingTrait {
1.8 +class DataSourceProvider : ServletContextListener {
1.9 +
1.10 + private val logger = MyLogger()
1.11
1.12 enum class Dialect {
1.13 Postgres
1.14 @@ -100,7 +102,7 @@
1.15 )
1.16 }
1.17 val metaData = conn.metaData
1.18 - logger().info(
1.19 + logger.info(
1.20 "Connections as {} to {}/{} ready to go.",
1.21 metaData.userName,
1.22 metaData.url,
1.23 @@ -108,18 +110,18 @@
1.24 )
1.25 }
1.26 } catch (ex: SQLException) {
1.27 - logger().error("Checking database connection failed", ex)
1.28 + logger.error("Checking database connection failed", ex)
1.29 }
1.30 }
1.31
1.32 private fun retrieveDataSource(ctx: Context): DataSource? {
1.33 return try {
1.34 val ret = ctx.lookup(DS_JNDI_NAME) as DataSource
1.35 - logger().info("Data source retrieved.")
1.36 + logger.info("Data source retrieved.")
1.37 ret
1.38 } catch (ex: NamingException) {
1.39 - logger().error("Data source {} not available.", DS_JNDI_NAME)
1.40 - logger().error("Reason for the missing data source: ", ex)
1.41 + logger.error("Data source {0} not available.", DS_JNDI_NAME)
1.42 + logger.error("Reason for the missing data source: ", ex)
1.43 null
1.44 }
1.45 }
1.46 @@ -132,8 +134,8 @@
1.47 try {
1.48 dialect = Dialect.valueOf(dbDialect)
1.49 } catch (ex: IllegalArgumentException) {
1.50 - logger().error(
1.51 - "Unknown or unsupported database dialect {}. Defaulting to {}.",
1.52 + logger.error(
1.53 + "Unknown or unsupported database dialect {0}. Defaulting to {1}.",
1.54 dbDialect,
1.55 dialect
1.56 )
1.57 @@ -141,22 +143,22 @@
1.58 }
1.59
1.60 dataSource = try {
1.61 - logger().debug("Trying to access JNDI context ...")
1.62 + logger.debug("Trying to access JNDI context ...")
1.63 val initialCtx: Context = InitialContext()
1.64 val ctx = initialCtx.lookup("java:comp/env") as Context
1.65 retrieveDataSource(ctx)
1.66 } catch (ex: NamingException) {
1.67 - logger().error("Cannot access JNDI resources.", ex)
1.68 + logger.error("Cannot access JNDI resources.", ex)
1.69 null
1.70 } catch (ex: ClassCastException) {
1.71 - logger().error("Cannot access JNDI resources.", ex)
1.72 + logger.error("Cannot access JNDI resources.", ex)
1.73 null
1.74 }
1.75
1.76 dataSource?.let { checkConnection(it, dbSchema) }
1.77
1.78 sc.setAttribute(SC_ATTR_NAME, this)
1.79 - logger().info("Database facade injected into ServletContext.")
1.80 + logger.info("Database facade injected into ServletContext.")
1.81 }
1.82
1.83 override fun contextDestroyed(sce: ServletContextEvent?) {
