From b73b37a8f0964ca4bac71a4d23f4516f64d02b23 Mon Sep 17 00:00:00 2001 From: javanna Date: Wed, 6 Aug 2014 13:30:03 +0200 Subject: [PATCH] Internal: fixed typo in NodeService s/disovery/discovery --- .../org/elasticsearch/node/service/NodeService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/elasticsearch/node/service/NodeService.java b/src/main/java/org/elasticsearch/node/service/NodeService.java index e08aae33aff04..1611da531b704 100644 --- a/src/main/java/org/elasticsearch/node/service/NodeService.java +++ b/src/main/java/org/elasticsearch/node/service/NodeService.java @@ -56,7 +56,7 @@ public class NodeService extends AbstractComponent { private final Version version; - private final Discovery disovery; + private final Discovery discovery; @Inject public NodeService(Settings settings, ThreadPool threadPool, MonitorService monitorService, Discovery discovery, @@ -67,7 +67,7 @@ public NodeService(Settings settings, ThreadPool threadPool, MonitorService moni this.monitorService = monitorService; this.transportService = transportService; this.indicesService = indicesService; - this.disovery = discovery; + this.discovery = discovery; discovery.setNodeService(this); this.version = version; this.pluginService = pluginService; @@ -104,7 +104,7 @@ public ImmutableMap attributes() { } public NodeInfo info() { - return new NodeInfo(version, Build.CURRENT, disovery.localNode(), serviceAttributes, + return new NodeInfo(version, Build.CURRENT, discovery.localNode(), serviceAttributes, settings, monitorService.osService().info(), monitorService.processService().info(), @@ -119,7 +119,7 @@ public NodeInfo info() { public NodeInfo info(boolean settings, boolean os, boolean process, boolean jvm, boolean threadPool, boolean network, boolean transport, boolean http, boolean plugin) { - return new NodeInfo(version, Build.CURRENT, disovery.localNode(), serviceAttributes, + return new NodeInfo(version, Build.CURRENT, discovery.localNode(), serviceAttributes, settings ? this.settings : null, os ? monitorService.osService().info() : null, process ? monitorService.processService().info() : null, @@ -135,7 +135,7 @@ public NodeInfo info(boolean settings, boolean os, boolean process, boolean jvm, public NodeStats stats() { // for indices stats we want to include previous allocated shards stats as well (it will // only be applied to the sensible ones to use, like refresh/merge/flush/indexing stats) - return new NodeStats(disovery.localNode(), System.currentTimeMillis(), + return new NodeStats(discovery.localNode(), System.currentTimeMillis(), indicesService.stats(true), monitorService.osService().stats(), monitorService.processService().stats(), @@ -153,7 +153,7 @@ public NodeStats stats(CommonStatsFlags indices, boolean os, boolean process, bo boolean fs, boolean transport, boolean http, boolean circuitBreaker) { // for indices stats we want to include previous allocated shards stats as well (it will // only be applied to the sensible ones to use, like refresh/merge/flush/indexing stats) - return new NodeStats(disovery.localNode(), System.currentTimeMillis(), + return new NodeStats(discovery.localNode(), System.currentTimeMillis(), indices.anySet() ? indicesService.stats(true, indices) : null, os ? monitorService.osService().stats() : null, process ? monitorService.processService().stats() : null,