Add maximum size in configuration stream output

rwilliams-r7 · Oct 4, 2016 · b42e36c · b42e36c
1 parent 9d9f1ed
commit b42e36c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java b/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java
@@ -116,6 +116,7 @@ private static void writeCommandConfigJson(JsonGenerator json, HystrixCommandKey
     private static void writeThreadPoolConfigJson(JsonGenerator json, HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolConfiguration threadPoolConfig) throws IOException {
         json.writeObjectFieldStart(threadPoolKey.name());
         json.writeNumberField("coreSize", threadPoolConfig.getCoreSize());
+        json.writeNumberField("maximumSize", threadPoolConfig.getMaximumSize());
         json.writeNumberField("maxQueueSize", threadPoolConfig.getMaxQueueSize());
         json.writeNumberField("queueRejectionThreshold", threadPoolConfig.getQueueRejectionThreshold());
         json.writeNumberField("keepAliveTimeInMinutes", threadPoolConfig.getKeepAliveTimeInMinutes());

diff --git a/...ix-serialization/src/main/java/com/netflix/hystrix/serial/SerialHystrixConfiguration.java b/...ix-serialization/src/main/java/com/netflix/hystrix/serial/SerialHystrixConfiguration.java
@@ -177,6 +177,7 @@ public static HystrixConfiguration fromByteBuffer(ByteBuffer bb) {
                 HystrixThreadPoolConfiguration threadPoolConfig = new HystrixThreadPoolConfiguration(
                        threadPoolKey,
                         threadPool.getValue().path("coreSize").asInt(),
+                        threadPool.getValue().path("maximumSize").asInt(),
                         threadPool.getValue().path("maxQueueSize").asInt(),
                         threadPool.getValue().path("queueRejectionThreshold").asInt(),
                         threadPool.getValue().path("keepAliveTimeInMinutes").asInt(),