From 3cda177b9b571b4edc9a48512c57fb830f3ecc19 Mon Sep 17 00:00:00 2001 From: kimchy Date: Sat, 26 Feb 2011 22:25:26 +0200 Subject: [PATCH] Zen Discovery: Rename `discovery.zen.initial_ping_timeout` to `discovery.zen.ping_timeout` (still support the old setting), closes #723. --- .../main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index a03a23612d6..5ad00ecdca1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -110,7 +110,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen this.transportService = transportService; this.pingService = pingService; - this.initialPingTimeout = componentSettings.getAsTime("initial_ping_timeout", timeValueSeconds(3)); + this.initialPingTimeout = componentSettings.getAsTime("ping_timeout", componentSettings.getAsTime("initial_ping_timeout", timeValueSeconds(3))); this.sendLeaveRequest = componentSettings.getAsBoolean("send_leave_request", true); logger.debug("using initial_ping_timeout [{}]", initialPingTimeout);