Remove unnecessary config field

ktorio · Dec 20, 2022 · 27727e6 · 27727e6
1 parent a532c45
commit 27727e6
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 50 deletions.
diff --git a/ktor-server/ktor-server-cio/jvm/test/io/ktor/tests/server/cio/CIOEngineTestJvm.kt b/ktor-server/ktor-server-cio/jvm/test/io/ktor/tests/server/cio/CIOEngineTestJvm.kt
@@ -44,7 +44,7 @@ class CIOSustainabilityTest : SustainabilityTestSuite<CIOApplicationEngine, CIOA
     }
 }
 
-class CIOConfigTest : ConfigTestSuite(CIO, { CIOApplicationEngine.Configuration() })
+class CIOConfigTest : ConfigTestSuite(CIO)
 
 class CIOConnectionTest : ConnectionTestSuite(CIO)
 

diff --git a/ktor-server/ktor-server-host-common/api/ktor-server-host-common.api b/ktor-server/ktor-server-host-common/api/ktor-server-host-common.api
@@ -11,13 +11,9 @@ public class io/ktor/server/engine/ApplicationEngine$Configuration {
 	public final fun getCallGroupSize ()I
 	public final fun getConnectionGroupSize ()I
 	public final fun getParallelism ()I
-	public final fun getShutdownGracePeriodMillis ()J
-	public final fun getShutdownTimeoutMillis ()J
 	public final fun getWorkerGroupSize ()I
 	public final fun setCallGroupSize (I)V
 	public final fun setConnectionGroupSize (I)V
-	public final fun setShutdownGracePeriodMillis (J)V
-	public final fun setShutdownTimeoutMillis (J)V
 	public final fun setWorkerGroupSize (I)V
 }
 

diff --git a/ktor-server/ktor-server-host-common/jvmAndNix/src/io/ktor/server/engine/ApplicationEngine.kt b/ktor-server/ktor-server-host-common/jvmAndNix/src/io/ktor/server/engine/ApplicationEngine.kt
@@ -37,16 +37,6 @@ public interface ApplicationEngine {
          * Specifies the minimum size of a thread pool used to process application calls.
          */
         public var callGroupSize: Int = parallelism
-
-        /**
-         * Specifies the maximum amount of time for activity to cool down in milliseconds.
-         */
-        public var shutdownGracePeriodMillis: Long = 500
-
-        /**
-         * Specifies the maximum amount of time to wait until a server stops gracefully in milliseconds.
-         */
-        public var shutdownTimeoutMillis: Long = 500
     }
 
     /**

diff --git a/ktor-server/ktor-server-host-common/jvmAndNix/src/io/ktor/server/engine/CommandLine.kt b/ktor-server/ktor-server-host-common/jvmAndNix/src/io/ktor/server/engine/CommandLine.kt
@@ -130,12 +130,6 @@ public fun BaseApplicationEngine.Configuration.loadCommonConfiguration(deploymen
     deploymentConfig.propertyOrNull("workerGroupSize")?.getString()?.toInt()?.let {
         workerGroupSize = it
     }
-    deploymentConfig.propertyOrNull("shutdownGracePeriod")?.getString()?.toLong()?.let {
-        shutdownGracePeriodMillis = it
-    }
-    deploymentConfig.propertyOrNull("shutdownTimeout")?.getString()?.toLong()?.let {
-        shutdownTimeoutMillis = it
-    }
 }
 
 internal fun String.splitPair(ch: Char): Pair<String, String>? = indexOf(ch).let { idx ->

diff --git a/ktor-server/ktor-server-jetty/jvm/test/io/ktor/tests/server/jetty/JettyEngineTest.kt b/ktor-server/ktor-server-jetty/jvm/test/io/ktor/tests/server/jetty/JettyEngineTest.kt
@@ -88,7 +88,7 @@ class JettyHttpServerJvmTest : HttpServerJvmTestSuite<JettyApplicationEngine, Je
 class JettySustainabilityTest :
     SustainabilityTestSuite<JettyApplicationEngine, JettyApplicationEngineBase.Configuration>(Jetty)
 
-class JettyConfigTest : ConfigTestSuite(Jetty, { JettyApplicationEngineBase.Configuration() })
+class JettyConfigTest : ConfigTestSuite(Jetty)
 
 class JettyConnectionTest : ConnectionTestSuite(Jetty)
 

diff --git a/ktor-server/ktor-server-netty/jvm/test/io/ktor/tests/server/netty/NettyEngineTest.kt b/ktor-server/ktor-server-netty/jvm/test/io/ktor/tests/server/netty/NettyEngineTest.kt
@@ -104,7 +104,7 @@ class NettySustainabilityTest : SustainabilityTestSuite<NettyApplicationEngine,
     }
 }
 
-class NettyConfigTest : ConfigTestSuite(Netty, { NettyApplicationEngine.Configuration() })
+class NettyConfigTest : ConfigTestSuite(Netty)
 
 class NettyConnectionTest : ConnectionTestSuite(Netty)
 

diff --git a/ktor-server/ktor-server-test-suites/jvm/src/io/ktor/server/testing/suites/ConfigTestSuite.kt b/ktor-server/ktor-server-test-suites/jvm/src/io/ktor/server/testing/suites/ConfigTestSuite.kt
@@ -4,8 +4,6 @@
 
 package io.ktor.server.testing.suites
 
-import com.typesafe.config.*
-import io.ktor.server.config.*
 import io.ktor.server.engine.*
 import kotlinx.coroutines.*
 import org.junit.*
@@ -15,10 +13,7 @@ import kotlin.system.*
 
 var count = 0
 
-abstract class ConfigTestSuite(
-    val engine: ApplicationEngineFactory<*, *>,
-    val configuration: () -> BaseApplicationEngine.Configuration
-) {
+abstract class ConfigTestSuite(val engine: ApplicationEngineFactory<*, *>) {
 
     @Test
     fun testStartOnceWhenException() {
@@ -64,24 +59,4 @@ abstract class ConfigTestSuite(
 
         assertTrue("Stop time is $time", time < 100)
     }
-
-    @Test
-    fun testCommonEngineConfiguration() {
-        val config = HoconApplicationConfig(
-            ConfigFactory.parseString(
-                """
-                    ktor {
-                        deployment {
-                            shutdownGracePeriod: 2000,
-                            shutdownTimeout: 6000
-                        }
-                    }
-                """.trimIndent()
-            )
-        )
-
-        val configuration = configuration().apply { loadCommonConfiguration(config.config("ktor.deployment")) }
-        assertEquals(2000, configuration.shutdownGracePeriodMillis)
-        assertEquals(6000, configuration.shutdownTimeoutMillis)
-    }
 }
diff --git a/ktor-server/ktor-server-tomcat/jvm/test/io/ktor/tests/server/tomcat/TomcatEngineTest.kt b/ktor-server/ktor-server-tomcat/jvm/test/io/ktor/tests/server/tomcat/TomcatEngineTest.kt
@@ -167,7 +167,7 @@ class TomcatSustainabilityTestSuite :
     }
 }
 
-class TomcatConfigTest : ConfigTestSuite(Tomcat, { TomcatApplicationEngine.Configuration() })
+class TomcatConfigTest : ConfigTestSuite(Tomcat)
 
 class TomcatConnectionTest : ConnectionTestSuite(Tomcat)