terribleplan/mangadex_at_home
1
0
Fork 0
forked from gitlab-com-mangadex-pub/mangadex_at_home
Code Issues Pull requests Releases Wiki Activity

Fix random arbitrary shutdown by using exceptions

Browse source
This commit is contained in:
carbotaniuman 2020-09-01 12:00:18 -05:00
parent 9ce7eccb47
commit 21699acc25
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/mdnet/base/ServerManager.kt
View file

@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.SerializationFeature
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.readValue
import java.lang.RuntimeException
import java.time.Instant import java.time.Instant
import java.util.Collections import java.util.Collections
import java.util.LinkedHashMap import java.util.LinkedHashMap
@ -145,7 +146,7 @@ class ServerManager(serverSettings: ServerSettings, devSettings: DevSettings, ma
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
LOGGER.warn(e) { "Main loop failed" } LOGGER.error(e) { "Main loop failed" }
} }
}, 15, 15, TimeUnit.SECONDS) }, 15, 15, TimeUnit.SECONDS)
@ -199,7 +200,8 @@ class ServerManager(serverSettings: ServerSettings, devSettings: DevSettings, ma
val state = this.state as Uninitialized val state = this.state as Uninitialized
val remoteSettings = serverHandler.loginToControl() val remoteSettings = serverHandler.loginToControl()
?: Main.dieWithError("Failed to get a login response from server - check API secret for validity") ?: throw RuntimeException("Failed to get a login response from server")
val server = getServer(cache, database, remoteSettings, state.serverSettings, statistics, isHandled).start() val server = getServer(cache, database, remoteSettings, state.serverSettings, statistics, isHandled).start()
if (remoteSettings.latestBuild > Constants.CLIENT_BUILD) { if (remoteSettings.latestBuild > Constants.CLIENT_BUILD) {