hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Fix db health check

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-11-05 15:34:37 +01:00
parent 568a2c6831
commit e6a7af840a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/HealthCheckService.kt
View File

@ -8,6 +8,6 @@ interface HealthCheckService {
} }
@Singleton @Singleton
class HealthCheckServiceImpl(private val dbHealthCheck: DbHealthCheck): HealthCheckService { class HealthCheckServiceImpl(private val dbHealthCheck: DbHealthCheck) : HealthCheckService {
override fun isOk() = dbHealthCheck.isOk() override fun isOk() = dbHealthCheck.isOk()
} }

7
simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/HealthCheck.kt
View File

@ -6,8 +6,7 @@ import be.simplenotes.persistance.utils.type
import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.database.Database
import me.liuwj.ktorm.database.asIterable import me.liuwj.ktorm.database.asIterable
import me.liuwj.ktorm.database.use import me.liuwj.ktorm.database.use
import java.io.EOFException import java.sql.SQLException
import java.sql.SQLTransientException
import javax.inject.Singleton import javax.inject.Singleton
interface DbHealthCheck { interface DbHealthCheck {
@ -26,9 +25,7 @@ internal class DbHealthCheckImpl(
it.executeQuery().asIterable().map { it.getString(1) } it.executeQuery().asIterable().map { it.getString(1) }
} }
}.any { it in dataSourceConfig.jdbcUrl } }.any { it in dataSourceConfig.jdbcUrl }
} catch (e: SQLTransientException) { } catch (e: SQLException) {
false
} catch (e: EOFException) {
false false
} }
} }