gitlab-com-mangadex-pub/mangadex_at_home
1
0
Fork 1
mirror of https://gitlab.com/mangadex-pub/mangadex_at_home.git synced 2024-01-19 02:48:37 +00:00
Code Releases Activity

Fix a bunch of random bugs

Browse source
This commit is contained in:
carbotaniuman 2021-01-08 17:11:20 -06:00
parent 6a3446a3d5
commit ab33d7a647
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security ### Security
## [1.2.3] - 2021-01-08
### Fixed
- [2021-01-08] Fix a bunch of stupid edge cases [@carbotaniuman].
## [1.2.2] - 2020-08-21 ## [1.2.2] - 2020-08-21
### Changed ### Changed
- [2020-08-11] Moved to a Java implementation of NaCl [@carbotaniuman]. - [2020-08-11] Moved to a Java implementation of NaCl [@carbotaniuman].

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

@ -174,7 +174,14 @@ class ServerManager(serverSettings: ServerSettings, devSettings: DevSettings, ma
private fun pingControl() { private fun pingControl() {
val state = this.state as Running val state = this.state as Running
val newSettings = serverHandler.pingControl(state.settings) val newSettings = serverHandler.pingControl(state.settings)?.run {
// copy the old tls over so we can do a simply equality check
if (tls == null) {
copy(tls = state.settings.tls)
} else {
this
}
}
if (newSettings != null) { if (newSettings != null) {
LOGGER.info { "Server settings received: $newSettings" } LOGGER.info { "Server settings received: $newSettings" }
@ -183,7 +190,7 @@ class ServerManager(serverSettings: ServerSettings, devSettings: DevSettings, ma
"Outdated build detected! Latest: ${newSettings.latestBuild}, Current: ${Constants.CLIENT_BUILD}" "Outdated build detected! Latest: ${newSettings.latestBuild}, Current: ${Constants.CLIENT_BUILD}"
} }
} }
if (newSettings.tls != null || newSettings.imageServer != state.settings.imageServer) { if (state.settings != newSettings) {
// certificates or upstream url must have changed, restart webserver // certificates or upstream url must have changed, restart webserver
LOGGER.info { "Doing internal restart of HTTP server to refresh certs/upstream URL" } LOGGER.info { "Doing internal restart of HTTP server to refresh certs/upstream URL" }

2
src/main/kotlin/mdnet/base/server/ImageServer.kt
View file

@ -29,6 +29,7 @@ import java.io.BufferedInputStream
import java.io.BufferedOutputStream import java.io.BufferedOutputStream
import java.io.File import java.io.File
import java.io.InputStream import java.io.InputStream
import java.lang.IllegalArgumentException
import java.time.Clock import java.time.Clock
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.util.* import java.util.*
@ -69,7 +70,6 @@ import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.sql.SchemaUtils import org.jetbrains.exposed.sql.SchemaUtils
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.lang.IllegalArgumentException
private val LOGGER = LoggerFactory.getLogger(ImageServer::class.java) private val LOGGER = LoggerFactory.getLogger(ImageServer::class.java)