mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2025-12-05 13:55:53 +00:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 40c4ae128f | |||
| 0f59009300 | |||
| a273f1117f | |||
| c8bb5e1195 | |||
| fbd98d67a9 | |||
| 2350555fbb | |||
| 4130f98caa | |||
| f8161c34a7 | |||
| 6fe333e437 | |||
| 5806fa1c31 | |||
| 2ff712327f | |||
| 72e8e35e3f | |||
| 030f9546f2 | |||
| 1b3c479766 | |||
| dcfb66ef6c | |||
| 763718716d | |||
| dfbc7be6f2 | |||
| ab0578b312 | |||
| 7b502e073d |
32
CHANGELOG.md
32
CHANGELOG.md
@@ -1,5 +1,37 @@
|
||||
# Changelog
|
||||
|
||||
## 2.3.4
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.7`
|
||||
* `microutils`: `0.12.16`
|
||||
|
||||
## 2.3.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.6`
|
||||
* `sqlite`: `3.39.3.0`
|
||||
|
||||
## 2.3.2
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `3.2.3`
|
||||
* `microutils`: `0.12.13`
|
||||
* `kslog`: `0.5.2`
|
||||
|
||||
## 2.3.1
|
||||
|
||||
* `Versions`:
|
||||
* `klock`: `3.1.0`
|
||||
* `tgbotapi`: `3.2.1`
|
||||
* `microutils`: `0.12.11`
|
||||
* `ktor`: `2.1.1`
|
||||
|
||||
## 2.3.0
|
||||
|
||||
* `Bot`:
|
||||
* Add option `reconnectOptions` in database config
|
||||
|
||||
## 2.2.0
|
||||
|
||||
* `Versions`:
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class DBConnectOptions(
|
||||
val attempts: Int = 3,
|
||||
val delay: Long = 1000L
|
||||
)
|
||||
@@ -1,11 +1,15 @@
|
||||
package dev.inmo.plagubot.config
|
||||
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.kslog.common.logger
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Transient
|
||||
import org.jetbrains.exposed.sql.Database
|
||||
import org.jetbrains.exposed.sql.transactions.transactionManager
|
||||
import org.koin.core.scope.Scope
|
||||
import org.sqlite.JDBC
|
||||
import java.lang.Exception
|
||||
import java.sql.Connection
|
||||
|
||||
inline val Scope.database: Database?
|
||||
@@ -16,15 +20,24 @@ data class DatabaseConfig(
|
||||
val url: String = "jdbc:sqlite:file:test?mode=memory&cache=shared",
|
||||
val driver: String = JDBC::class.qualifiedName!!,
|
||||
val username: String = "",
|
||||
val password: String = ""
|
||||
val password: String = "",
|
||||
val reconnectOptions: DBConnectOptions? = DBConnectOptions()
|
||||
) {
|
||||
@Transient
|
||||
val database: Database = Database.connect(
|
||||
url,
|
||||
driver,
|
||||
username,
|
||||
password
|
||||
).also {
|
||||
it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
|
||||
}
|
||||
val database: Database = (0 until (reconnectOptions ?.attempts ?: 1)).firstNotNullOfOrNull {
|
||||
runCatching {
|
||||
Database.connect(
|
||||
url,
|
||||
driver,
|
||||
username,
|
||||
password
|
||||
).also {
|
||||
it.transactionManager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE // Or Connection.TRANSACTION_READ_UNCOMMITTED
|
||||
it.connector().close()
|
||||
}
|
||||
}.onFailure {
|
||||
logger.e(it)
|
||||
Thread.sleep(reconnectOptions ?.delay ?: return@onFailure)
|
||||
}.getOrNull()
|
||||
} ?: error("Unable to create database")
|
||||
}
|
||||
|
||||
@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
|
||||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=2.2.0
|
||||
version=2.3.4
|
||||
|
||||
@@ -4,19 +4,19 @@ kt = "1.7.10"
|
||||
kt-serialization = "1.4.0"
|
||||
kt-coroutines = "1.6.4"
|
||||
|
||||
microutils = "0.12.4"
|
||||
tgbotapi = "3.2.0"
|
||||
kslog = "0.5.1"
|
||||
microutils = "0.12.16"
|
||||
tgbotapi = "3.2.7"
|
||||
kslog = "0.5.2"
|
||||
|
||||
jb-exposed = "0.39.2"
|
||||
jb-dokka = "1.7.10"
|
||||
|
||||
sqlite = "3.36.0.3"
|
||||
sqlite = "3.39.3.0"
|
||||
|
||||
klock = "3.0.0"
|
||||
klock = "3.1.0"
|
||||
uuid = "0.5.0"
|
||||
|
||||
ktor = "2.1.0"
|
||||
ktor = "2.1.1"
|
||||
|
||||
gh-release = "2.4.1"
|
||||
|
||||
|
||||
@@ -4,7 +4,10 @@
|
||||
"driver": "org.sqlite.JDBC",
|
||||
"username": "OPTIONAL username",
|
||||
"password": "OPTIONAL password",
|
||||
"initAutomatically": false
|
||||
"reconnectOptions": {
|
||||
"attempts": 3,
|
||||
"delay": 1000
|
||||
}
|
||||
},
|
||||
"botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678",
|
||||
"plugins": [
|
||||
|
||||
Reference in New Issue
Block a user