Merge pull request #736 from zalando/aruha-1083-fix-gzip-flush

aruha-1083 fix gzip flush
zalando · Aug 22, 2017 · fce3b29 · fce3b29
2 parents 833a1fb + c6fe850
commit fce3b29
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+- Sync flush batches when using gzip streams.
+
 ## [2.1.0] - 2017-08-21
 
 ### Changed

diff --git a/src/main/java/org/zalando/nakadi/config/JettyConfig.java b/src/main/java/org/zalando/nakadi/config/JettyConfig.java
@@ -1,5 +1,6 @@
 package org.zalando.nakadi.config;
 
+import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
@@ -22,6 +23,11 @@ public JettyEmbeddedServletContainerFactory jettyEmbeddedServletContainerFactory
             threadPool.setMaxThreads(Integer.valueOf(maxThreads));
             threadPool.setMinThreads(Integer.valueOf(minThreads));
             threadPool.setIdleTimeout(Integer.valueOf(idleTimeout));
+
+            final GzipHandler gzipHandler = new GzipHandler();
+            gzipHandler.setHandler(server.getHandler());
+            gzipHandler.setSyncFlush(true);
+            server.setHandler(gzipHandler);
         });
         return factory;
     }

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,8 +1,5 @@
 server:
   port: 8080
-  compression:
-    enabled: true
-    mime-types: text/plain,application/x-json-stream
 management:
   port: 7979
 logging: