From 2082840714ecd2443b0318f5e97a69ff47a56757 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 10 Apr 2014 17:24:52 -0700 Subject: [PATCH] merge GET metrics fix --- .../clustermate/service/metrics/AllOperationMetrics.java | 3 ++- .../fasterxml/clustermate/servlet/StoreEntryInfoServlet.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clustermate-service/src/main/java/com/fasterxml/clustermate/service/metrics/AllOperationMetrics.java b/clustermate-service/src/main/java/com/fasterxml/clustermate/service/metrics/AllOperationMetrics.java index c628b0b6..2af5b6a1 100644 --- a/clustermate-service/src/main/java/com/fasterxml/clustermate/service/metrics/AllOperationMetrics.java +++ b/clustermate-service/src/main/java/com/fasterxml/clustermate/service/metrics/AllOperationMetrics.java @@ -2,13 +2,14 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; -@JsonPropertyOrder({ "GET", "PUT", "DELETE", "LIST", "SYNCLIST", "SYNCPULL" }) +@JsonPropertyOrder({ "GET", "PUT", "DELETE", "INFO", "LIST", "SYNCLIST", "SYNCPULL" }) public class AllOperationMetrics { public ExternalOperationMetrics GET; public ExternalOperationMetrics PUT; public ExternalOperationMetrics DELETE; + public ExternalOperationMetrics INFO; public ExternalOperationMetrics LIST; public ExternalOperationMetrics SYNCLIST; diff --git a/clustermate-servlet/src/main/java/com/fasterxml/clustermate/servlet/StoreEntryInfoServlet.java b/clustermate-servlet/src/main/java/com/fasterxml/clustermate/servlet/StoreEntryInfoServlet.java index fd6ed323..5e083e2f 100644 --- a/clustermate-servlet/src/main/java/com/fasterxml/clustermate/servlet/StoreEntryInfoServlet.java +++ b/clustermate-servlet/src/main/java/com/fasterxml/clustermate/servlet/StoreEntryInfoServlet.java @@ -111,7 +111,7 @@ public ServletBase createRoutingServlet() { @Override public void fillOperationMetrics(AllOperationMetrics metrics) { - metrics.GET = ExternalOperationMetrics.create(_getMetrics); + metrics.INFO = ExternalOperationMetrics.create(_getMetrics); _storeHandler.augmentOperationMetrics(metrics); }