Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'release/0.0.11-1'

  • Loading branch information...
commit b3a4707e81cb3c01e24bf1f3c9c3bb3307c43902 2 parents 846f5f7 + 20f6598
Coda Hale codahale authored
2  pom.xml
@@ -6,7 +6,7 @@
6 6
7 7 <groupId>com.yammer</groupId>
8 8 <artifactId>dropwizard_2.9.1</artifactId>
9   - <version>0.0.11</version>
  9 + <version>0.0.11-1</version>
10 10 <name>Dropwizard for Scala ${scala.version}</name>
11 11
12 12 <properties>
8 src/main/scala/com/yammer/dropwizard/config/ServerFactory.scala
@@ -24,7 +24,7 @@ object ServerFactory extends Logging {
24 24 val server = makeServer(mainConnector, internalConnector)
25 25
26 26 val handlers = new HandlerCollection
27   - handlers.addHandler(new InstrumentedHandler(servletContext))
  27 + handlers.addHandler(servletContext)
28 28 handlers.addHandler(internalServletContext)
29 29 if (config("request_log.enabled").or(false)) {
30 30 handlers.addHandler(RequestLogHandlerFactory.buildHandler)
@@ -102,14 +102,16 @@ object ServerFactory extends Logging {
102 102 }
103 103
104 104 context.setConnectorNames(Array("main"))
  105 +
  106 + val instrumented = new InstrumentedHandler(context)
105 107 if (config("http.gzip.enabled").or(true)) {
106   - val gzip = new GzipHandler(context)
  108 + val gzip = new GzipHandler(instrumented)
107 109 config("http.gzip.min_entity_size_bytes").asOption[Int].foreach(gzip.setMinGzipSize)
108 110 config("http.gzip.buffer_size_kilobytes").asOption[Int].foreach { n => gzip.setBufferSize(n * 1024) }
109 111 config("http.gzip.excluded_user_agents").asOption[Set[String]].foreach { s => gzip.setExcluded(s.asJava) }
110 112 config("http.gzip.mime_types").asOption[Set[String]].foreach {s => gzip.setMimeTypes(s.asJava)}
111 113 gzip
112   - } else context
  114 + } else instrumented
113 115 }
114 116
115 117 private def internalServletContext(implicit tasks: Set[Task]) = {

0 comments on commit b3a4707

Please sign in to comment.
Something went wrong with that request. Please try again.