Merge pull request #42 from spand/pr/jettyfactorymethod

Inject factory method for the jetty Server object.
ktorio · Sep 14, 2016 · 5bbb2fa · 5bbb2fa
2 parents 011e86a + fe82da3
commit 5bbb2fa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ktor-hosts/ktor-jetty/src/org/jetbrains/ktor/jetty/JettyApplicationHost.kt b/ktor-hosts/ktor-jetty/src/org/jetbrains/ktor/jetty/JettyApplicationHost.kt
@@ -26,14 +26,15 @@ import javax.servlet.http.*
  */
 class JettyApplicationHost(override val hostConfig: ApplicationHostConfig,
  val environment: ApplicationEnvironment,
- val applicationLifecycle: ApplicationLifecycle) : ApplicationHost, ApplicationHostStartable {
+ val applicationLifecycle: ApplicationLifecycle,
+ jettyServer: () -> Server = ::Server) : ApplicationHost, ApplicationHostStartable {
 
  private val application: Application get() = applicationLifecycle.application
 
  constructor(hostConfig: ApplicationHostConfig, environment: ApplicationEnvironment)
  : this(hostConfig, environment, ApplicationLoader(environment, hostConfig.autoreload))
 
- private val server = Server().apply {
+ private val server = jettyServer().apply {
  connectors = hostConfig.connectors.map { ktorConnector ->
  val httpConfig = HttpConfiguration().apply {
  sendServerVersion = false