diff --git a/server/src/main/java/com/metamx/druid/http/MasterMain.java b/server/src/main/java/com/metamx/druid/http/MasterMain.java index 851aea69103..6dc8fa8ad0a 100644 --- a/server/src/main/java/com/metamx/druid/http/MasterMain.java +++ b/server/src/main/java/com/metamx/druid/http/MasterMain.java @@ -332,7 +332,6 @@ public class MasterMain ); root.addFilter(GuiceFilter.class, "/info/*", 0); root.addFilter(GuiceFilter.class, "/master/*", 0); - root.addFilter(GuiceFilter.class, "/masterSegmentSettings/*",0); server.start(); server.join(); diff --git a/server/src/main/java/com/metamx/druid/http/MasterSegmentSettingsResource.java b/server/src/main/java/com/metamx/druid/http/MasterSegmentSettingsResource.java index ab342500c1d..ea14c587f78 100644 --- a/server/src/main/java/com/metamx/druid/http/MasterSegmentSettingsResource.java +++ b/server/src/main/java/com/metamx/druid/http/MasterSegmentSettingsResource.java @@ -31,7 +31,7 @@ import javax.ws.rs.core.Response; /** */ -@Path("/masterSegmentSettings") +@Path("/master/config") public class MasterSegmentSettingsResource { private final JacksonConfigManager manager; @@ -44,7 +44,6 @@ public class MasterSegmentSettingsResource this.manager=manager; } @GET - @Path("/config") @Produces("application/json") public Response getDynamicConfigs() { @@ -56,7 +55,6 @@ public class MasterSegmentSettingsResource } @POST - @Path("/config") @Consumes("application/json") public Response setDynamicConfigs( final MasterSegmentSettings masterSegmentSettings diff --git a/server/src/main/resources/static/js/masterSegmentSettings.js b/server/src/main/resources/static/js/masterSegmentSettings.js index 6eb614b52cf..b992cc8cf19 100644 --- a/server/src/main/resources/static/js/masterSegmentSettings.js +++ b/server/src/main/resources/static/js/masterSegmentSettings.js @@ -1,5 +1,5 @@ $(function () { - $.get('../masterSegmentSettings/config', function (data) { + $.get('../master/config', function (data) { document.getElementById("millis").value=data["millisToWaitBeforeDeleting"]; document.getElementById("mergeBytes").value = data["mergeBytesLimit"]; document.getElementById("mergeSegments").value = data["mergeSegmentsLimit"]; @@ -15,7 +15,7 @@ $(function () { values[list[i]["name"]]=list[i]["value"]; } $.ajax({ - url:'../masterSegmentSettings/config', + url:'../master/config', type:"POST", data: JSON.stringify(values), contentType:"application/json; charset=utf-8",