You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/05/15 00:06:21 UTC

git commit: Enabling gzip encoding for /api/* end point.

Repository: incubator-aurora
Updated Branches:
  refs/heads/master f837a7dfe -> 5cdc03b24


Enabling gzip encoding for /api/* end point.

Fixing a bad merge from https://reviews.apache.org/r/18658/

Testing Done:
Tested on laptop.

Reviewed at https://reviews.apache.org/r/21460/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/5cdc03b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/5cdc03b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/5cdc03b2

Branch: refs/heads/master
Commit: 5cdc03b24fd6905070b13aaaf51866a7e845e816
Parents: f837a7d
Author: Suman Karumuri <ma...@apache.org>
Authored: Wed May 14 15:05:51 2014 -0700
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Wed May 14 15:05:51 2014 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java | 2 +-
 .../resources/org/apache/aurora/scheduler/http/ui/js/services.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5cdc03b2/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
index c14d5c2..fc5610e 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/ThriftModule.java
@@ -39,7 +39,7 @@ public class ThriftModule extends AbstractModule {
     Registration.registerServlet(binder(), "/api", SchedulerAPIServlet.class, true);
     // NOTE: GzipFilter is applied only to /api instead of globally because the Jersey-managed
     // servlets from ServletModule have a conflicting filter applied to them.
-    Registration.registerServletFilter(binder(), GzipFilter.class, "/api");
+    Registration.registerServletFilter(binder(), GzipFilter.class, "/api/*");
 
     install(new AopModule());
   }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5cdc03b2/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
index feb9ece..7722900 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
@@ -62,7 +62,7 @@ auroraUI.factory(
 
         getSchedulerClient: function () {
           if (!auroraClient.schedulerClient) {
-            var transport = new Thrift.Transport("/api/");
+            var transport = new Thrift.Transport("/api");
             var protocol = new Thrift.Protocol(transport);
             auroraClient.schedulerClient = new ReadOnlySchedulerClient(protocol);
             return auroraClient.schedulerClient;