Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Small tweaks

Browse Source
This commit is contained in:
Dico Karssiens
2018-09-30 15:16:08 +01:00
parent 88acca2d97
commit 7f36b6f561
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt
View File

@@ -50,7 +50,7 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
return return
} }
val newlyCreatedWorlds = mutableListOf<ParcelWorld>() //val newlyCreatedWorlds = mutableListOf<ParcelWorld>()
for ((worldName, worldOptions) in options.worlds.entries) { for ((worldName, worldOptions) in options.worlds.entries) {
var parcelWorld = _worlds[worldName] var parcelWorld = _worlds[worldName]
if (parcelWorld != null) continue if (parcelWorld != null) continue
@@ -70,7 +70,7 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
val time = DateTime.now() val time = DateTime.now()
plugin.storage.setWorldCreationTime(parcelWorld.id, time) plugin.storage.setWorldCreationTime(parcelWorld.id, time)
parcelWorld.creationTime = time parcelWorld.creationTime = time
newlyCreatedWorlds.add(parcelWorld) //newlyCreatedWorlds.add(parcelWorld)
} else { } else {
GlobalScope.launch(context = Dispatchers.Unconfined) { GlobalScope.launch(context = Dispatchers.Unconfined) {
parcelWorld.creationTime = plugin.storage.getWorldCreationTime(parcelWorld.id).await() ?: DateTime.now() parcelWorld.creationTime = plugin.storage.getWorldCreationTime(parcelWorld.id).await() ?: DateTime.now()
@@ -80,10 +80,10 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
_worlds[worldName] = parcelWorld _worlds[worldName] = parcelWorld
} }
loadStoredData(newlyCreatedWorlds.toSet()) loadStoredData()
} }
private fun loadStoredData(newlyCreatedWorlds: Collection<ParcelWorld> = emptyList()) { private fun loadStoredData() {
plugin.launch(Dispatchers.Default) { plugin.launch(Dispatchers.Default) {
val migration = plugin.options.migration val migration = plugin.options.migration
if (migration.enabled) { if (migration.enabled) {
@@ -105,8 +105,9 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
val channel = plugin.storage.transmitAllParcelData() val channel = plugin.storage.transmitAllParcelData()
while (true) { while (true) {
val (id, data) = channel.receiveOrNull() ?: break val (id, data) = channel.receiveOrNull() ?: break
if (data == null) continue
val parcel = getParcelById(id) ?: continue val parcel = getParcelById(id) ?: continue
data?.let { parcel.copyData(it, callerIsDatabase = true) } parcel.copyData(data, callerIsDatabase = true)
} }
} }

2
src/main/kotlin/io/dico/parcels2/storage/Hikari.kt
View File

@@ -32,7 +32,7 @@ fun getHikariConfig(dialectName: String,
username = dco.username username = dco.username
password = dco.password password = dco.password
connectionTimeout = 15000 connectionTimeout = 15000
leakDetectionThreshold = 10000 leakDetectionThreshold = 30000
connectionTestQuery = "SELECT 1" connectionTestQuery = "SELECT 1"