AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 03:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

threading: remove configuration io thread

Browse Source
This commit is contained in:
Bixilon 2021-03-20 14:19:01 +01:00
parent 8b2705a1f5
commit 09f7df7c93
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/main/java/de/bixilon/minosoft/config/Configuration.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.config
import com.squareup.moshi.JsonWriter
import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.config.config.Config
import de.bixilon.minosoft.util.Util
import de.bixilon.minosoft.util.json.JSONSerializer
@ -23,11 +24,10 @@ import java.io.FileWriter
import java.io.IOException
class Configuration(private val configName: String = StaticConfiguration.CONFIG_FILENAME) {
private val lock = Object()
private val file = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName)
val config: Config
init {
val file = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName)
if (file.exists()) {
config = JSONSerializer.CONFIG_ADAPTER.fromJson(Util.readFile(file.absolutePath))!!
@ -42,53 +42,44 @@ class Configuration(private val configName: String = StaticConfiguration.CONFIG_
config = Config()
Log.debug("Created new config file")
}
Thread({
while (true) {
// wait for interrupt
synchronized(lock) {
try {
lock.wait()
} catch (ignored: InterruptedException) {
}
}
// write config to temp file, delete original config, rename temp file to original file to avoid conflicts if minosoft gets closed while saving the config
val tempFile = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName + ".tmp")
Util.createParentFolderIfNotExist(tempFile)
val buffer = Buffer()
val jsonWriter: JsonWriter = JsonWriter.of(buffer)
jsonWriter.indent = " "
synchronized(this.config) {
JSONSerializer.CONFIG_ADAPTER.toJson(jsonWriter, config)
}
val writer: FileWriter = try {
FileWriter(tempFile)
} catch (e: IOException) {
e.printStackTrace()
return@Thread
}
writer.write(buffer.readUtf8())
try {
writer.close()
} catch (e: IOException) {
e.printStackTrace()
}
if (file.exists()) {
if (!file.delete()) {
throw RuntimeException("Could not save config!")
}
}
if (!tempFile.renameTo(file)) {
Log.fatal("An error occurred while saving the config file")
} else {
Log.verbose("Configuration saved to file %s", configName)
}
}
}, "IO").start()
}
fun saveToFile() {
synchronized(lock) { lock.notifyAll() }
Minosoft.THREAD_POOL.execute {
// write config to temp file, delete original config, rename temp file to original file to avoid conflicts if minosoft gets closed while saving the config
val tempFile = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName + ".tmp")
Util.createParentFolderIfNotExist(tempFile)
val buffer = Buffer()
val jsonWriter: JsonWriter = JsonWriter.of(buffer)
jsonWriter.indent = " "
synchronized(this.config) {
JSONSerializer.CONFIG_ADAPTER.toJson(jsonWriter, config)
}
val writer: FileWriter = try {
FileWriter(tempFile)
} catch (e: IOException) {
e.printStackTrace()
return@execute
}
writer.write(buffer.readUtf8())
try {
writer.close()
} catch (e: IOException) {
e.printStackTrace()
}
if (file.exists()) {
if (!file.delete()) {
throw RuntimeException("Could not save config!")
}
}
if (!tempFile.renameTo(file)) {
Log.fatal("An error occurred while saving the config file")
} else {
Log.verbose("Configuration saved to file %s", configName)
}
}
}
private fun migrateConfiguration() {