Merge pull request #41 from spand/pr/threadnaming

Bind pool number and thread counter instead of globally for DefaultEx…
ktorio · Sep 13, 2016 · 011e86a · 011e86a
2 parents 24d5a1d + d0d0b7f
commit 011e86a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ktor-core/src/org/jetbrains/ktor/application/ApplicationEnvironment.kt b/ktor-core/src/org/jetbrains/ktor/application/ApplicationEnvironment.kt
@@ -53,9 +53,10 @@ class ApplicationEnvironmentBuilder : ApplicationEnvironment {
 }
 
 private val poolCounter = AtomicInteger()
-private val threadCounter = AtomicInteger()
 internal val DefaultExecutorServiceBuilder = {
+ val pool: Int = poolCounter.incrementAndGet()
+ val threadCounter = AtomicInteger()
  Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors(), { r ->
- Thread(r, "ktor-pool-${poolCounter.incrementAndGet()}-thread-${threadCounter.incrementAndGet()}")
- })!!
+ Thread(r, "ktor-pool-$pool-thread-${threadCounter.incrementAndGet()}")
+ })
 }