diff --git a/CHANGELOG.md b/CHANGELOG.md index 09997b0..a6bb66c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## [2.0.0-rc6] - 2021-01-27 +### Fixed +- [2021-01-27] Upped max threadpool size [@carbotaniuman]. + ## [2.0.0-rc5] - 2021-01-27 ### Changed - [2021-01-27] Minor code tweaks [@carbotaniuman]. @@ -312,7 +316,8 @@ This release contains many breaking changes! Of note are the changes to the cach ### Fixed - [2020-06-11] Tweaked logging configuration to reduce log file sizes by [@carbotaniuman]. -[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc5...HEAD +[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc6...HEAD +[2.0.0-rc6]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc5...2.0.0-rc6 [2.0.0-rc5]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc4...2.0.0-rc5 [2.0.0-rc4]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc3...2.0.0-rc4 [2.0.0-rc3]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc2...2.0.0-rc3 diff --git a/src/main/kotlin/mdnet/netty/ApplicationNetty.kt b/src/main/kotlin/mdnet/netty/ApplicationNetty.kt index 95f0c25..244465e 100644 --- a/src/main/kotlin/mdnet/netty/ApplicationNetty.kt +++ b/src/main/kotlin/mdnet/netty/ApplicationNetty.kt @@ -108,9 +108,11 @@ sealed class NettyTransport(threads: Int) { val name = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim { it <= ' ' } val threadsToUse = if (threads == 0) defaultNumThreads() else threads + LOGGER.info { "Choosing a transport using $threadsToUse" } + if (name.startsWith("linux")) { if (IOUring.isAvailable()) { - LOGGER.info("Using IOUring transport") + LOGGER.info { "Using IOUring transport" } return IOUringTransport(threadsToUse) } else { LOGGER.info(IOUring.unavailabilityCause()) { @@ -119,7 +121,7 @@ sealed class NettyTransport(threads: Int) { } if (Epoll.isAvailable()) { - LOGGER.info("Using Epoll transport") + LOGGER.info { "Using Epoll transport" } return EpollTransport(threadsToUse) } else { LOGGER.info(Epoll.unavailabilityCause()) { @@ -128,7 +130,7 @@ sealed class NettyTransport(threads: Int) { } } - LOGGER.info("Using Nio transport") + LOGGER.info { "Using Nio transport" } return NioTransport(threadsToUse) } } diff --git a/src/main/kotlin/mdnet/server/ImageServer.kt b/src/main/kotlin/mdnet/server/ImageServer.kt index c00fed8..d4d95e7 100644 --- a/src/main/kotlin/mdnet/server/ImageServer.kt +++ b/src/main/kotlin/mdnet/server/ImageServer.kt @@ -249,8 +249,8 @@ fun getServer( ) .setConnectionManager( PoolingHttpClientConnectionManagerBuilder.create() - .setMaxConnTotal(3000) - .setMaxConnPerRoute(100) + .setMaxConnTotal(500) + .setMaxConnPerRoute(500) .build() ) .build()