From d438d3c10dd32470a15f7fc11905c4ea251f972e Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 2 May 2017 11:53:26 +0200
Subject: [PATCH] remove unused settings property
---
.../src/main/assembly/config/elasticsearch.yml | 5 ++---
.../src/test/es-home/config/elasticsearch.yml | 7 +++----
.../elasticsearch/service/changes/ChangeService.java | 1 -
.../src/test/es-home/config/elasticsearch.yml | 5 ++++-
.../src/test/es-home/config/elasticsearch.yml | 5 ++++-
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml b/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml
index 2a1f079b..fb20150b 100644
--- a/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml
+++ b/duniter4j-es-assembly/src/main/assembly/config/elasticsearch.yml
@@ -190,11 +190,10 @@ duniter.mail.enable: false
#
#duniter.mail.subject.prefix: '[Cesium+]'
-# ---------------------------------- Duniter4j Changes module ------------------------
+# ---------------------------------- Duniter4j Websocket server ----------------------
#
-# Index to listen, for the changes module (Allow to listen changes throw websocket)
+# Websocket port (usefull for listen changes)
#
-duniter.changes.listenSource: '*/block'
duniter.ws.port: 9400
# ---------------------------------- Duniter4j Subscription module -------------------
diff --git a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
index 7950b7cb..d022151c 100644
--- a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
@@ -123,6 +123,7 @@ duniter.string.analyzer: french
# Enabling node blockchain synchronization
#
duniter.blockchain.enable: true
+duniter.blockchain.reload: true
#
# Force to reset and reload the blockchain, at startup - DO SET to true in production
#
@@ -189,7 +190,6 @@ duniter.mail.smtp.port: 25
#
#duniter.mail.from: no-reply@domain.com
duniter.mail.from: 'no-reply@duniter.fr'
-
#
# Mail: admin address
#
@@ -201,11 +201,10 @@ duniter.mail.admin: 'benoit.lavenier@e-is.pro'
#
#duniter.mail.subject.prefix: '[Cesium+]'
-# ---------------------------------- Duniter4j Changes module ----------------------
+# ---------------------------------- Duniter4j Websocket server ----------------------
#
-# Index to listen, for the changes module (Allow to listen changes throw websocket)
+# Websocket port (usefull for listen changes)
#
-duniter.changes.listenSource: '*/block'
duniter.ws.port: 9400
# ---------------------------------- Duniter4j Subscription module -----------------
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
index 2faa3099..95392288 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
@@ -62,7 +62,6 @@ public class ChangeService {
}
private static final String SETTING_PRIMARY_SHARD_ONLY = "duniter.changes.primaryShardOnly";
- private static final String SETTING_LISTEN_SOURCE = "duniter.changes.listenSource";
private final ESLogger log = Loggers.getLogger(ChangeService.class);
diff --git a/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml
index e1c3d91b..9d3087fc 100644
--- a/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml
@@ -174,5 +174,8 @@ duniter.mail.admin: blavenie@EIS-DEV
#
#duniter.mail.subject.prefix: [Duniter4j ES]
-duniter.changes.listenSource: '*/block'
+# ---------------------------------- Duniter4j Websocket server ----------------------
+#
+# Websocket port (usefull for listen changes)
+#
duniter.ws.port: 9400
diff --git a/duniter4j-es-subscription/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-subscription/src/test/es-home/config/elasticsearch.yml
index abd6812e..1a8345b4 100644
--- a/duniter4j-es-subscription/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-subscription/src/test/es-home/config/elasticsearch.yml
@@ -178,7 +178,10 @@ duniter.mail.admin: blavenie@EIS-DEV
#
#duniter.mail.subject.prefix: [Duniter4j ES]
-duniter.changes.listenSource: '*/block'
+# ---------------------------------- Duniter4j Websocket server ----------------------
+#
+# Websocket port (usefull for listen changes)
+#
duniter.ws.port: 9400
# ---------------------------------- Duniter4j Subscription services ------------
--
GitLab