From 0fceb734516b1cb98ab2c839bcee5295701513b2 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 15 Sep 2017 17:33:47 +0200
Subject: [PATCH] fix TU log level
---
.../src/main/assembly/config/logging.yml | 2 ++
.../src/test/es-home/config/elasticsearch.yml | 17 +++++++-----
.../src/test/es-home/config/logging.yml | 22 +++++++++-------
.../src/test/misc/test_docstat.sh | 15 +++++++++++
.../src/test/misc/test_scroll.sh | 24 +++++++++++++++++
.../src/test/es-home/config/elasticsearch.yml | 2 +-
.../src/test/es-home/config/logging.yml | 3 ++-
.../service/BlockchainServiceTest.java | 7 +++--
.../src/test/resources/log4j.properties | 2 +-
.../src/test/es-home/config/logging.yml | 18 +++++++++----
.../src/test/es-home/config/elasticsearch.yml | 2 +-
.../src/test/es-home/config/logging.yml | 26 ++++++++++++-------
12 files changed, 101 insertions(+), 39 deletions(-)
create mode 100755 duniter4j-es-assembly/src/test/misc/test_docstat.sh
create mode 100755 duniter4j-es-assembly/src/test/misc/test_scroll.sh
diff --git a/duniter4j-es-assembly/src/main/assembly/config/logging.yml b/duniter4j-es-assembly/src/main/assembly/config/logging.yml
index bfd01648..2d99c771 100644
--- a/duniter4j-es-assembly/src/main/assembly/config/logging.yml
+++ b/duniter4j-es-assembly/src/main/assembly/config/logging.yml
@@ -16,6 +16,8 @@ logger:
duniter: INFO
security: INFO
+ cluster.metadata: ERROR
+ cluster.routing.allocation: ERROR
org.duniter: INFO
org.nuiton.i18n: ERROR
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 385488bb..c8928b70 100644
--- a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
@@ -15,7 +15,7 @@
# Use a descriptive name for your cluster:
#
# cluster.name: my-application
-cluster.name: duniter4j-elasticsearch-test
+cluster.name: duniter4j-es-assembly-test-2
#
# ------------------------------------ Node ------------------------------------
#
@@ -158,10 +158,15 @@ duniter.security.enable: true
#
# Should synchronize data from an existing ES node ?
#
-#duniter.data.sync.enable: false
-duniter.data.sync.enable: true
-duniter.data.sync.host: g1.data.duniter.fr
-duniter.data.sync.port: 443
+duniter.data.sync.enable: false
+#duniter.data.sync.enable: true
+duniter.data.sync.host: localhost
+duniter.data.sync.port: 9200
+
+#
+# Should maintain stats on data ?
+#
+duniter.data.stats.enable: true
# ---------------------------------- Duniter4j Mail module -----------------------
#
@@ -203,7 +208,7 @@ duniter.mail.admin: 'benoit.lavenier@e-is.pro'
#
# Websocket port (usefull for listen changes)
#
-duniter.ws.port: 9400
+duniter.ws.port: 9400-9410
# ---------------------------------- Duniter4j Subscription module -------------------
#
diff --git a/duniter4j-es-assembly/src/test/es-home/config/logging.yml b/duniter4j-es-assembly/src/test/es-home/config/logging.yml
index 0676ba19..156875ec 100644
--- a/duniter4j-es-assembly/src/test/es-home/config/logging.yml
+++ b/duniter4j-es-assembly/src/test/es-home/config/logging.yml
@@ -14,25 +14,27 @@ logger:
com.amazonaws.jmx.SdkMBeanRegistrySupport: ERROR
com.amazonaws.metrics.AwsSdkMetrics: ERROR
- duniter: DEBUG
- duniter.core: DEBUG
- duniter.security: ERROR
- duniter.user.event: INFO
- duniter.network.p2p: INFO
- duniter.network.peer: DEBUG
- duniter.mail: DEBUG
- duniter.subscription: DEBUG
+ duniter: INFO
+ #duniter.core: DEBUG
+ #duniter.security: ERROR
+ #duniter.user.event: DEBUG
+ #duniter.network.p2p: DEBUG
+ #duniter.network.peer: DEBUG
+ #duniter.mail: DEBUG
+ #duniter.subscription: DEBUG
security: DEBUG
+ cluster.metadata: ERROR
+ cluster.routing.allocation: ERROR
org.duniter: INFO
- org.duniter.core.util.LockManager: DEBUG
+ #org.duniter.core.util.LockManager: DEBUG
#org.duniter.core.beans: DEBUG
#org.duniter.core.client.service: DEBUG
#org.duniter.elasticsearch: DEBUG
#org.duniter.elasticsearch.service: DEBUG
#org.duniter.elasticsearch.user.service: DEBUG
- org.duniter.elasticsearch.subscription.service: DEBUG
+ #org.duniter.elasticsearch.subscription.service: DEBUG
org.nuiton.i18n: ERROR
org.nuiton.config: ERROR
diff --git a/duniter4j-es-assembly/src/test/misc/test_docstat.sh b/duniter4j-es-assembly/src/test/misc/test_docstat.sh
new file mode 100755
index 00000000..a46e72ab
--- /dev/null
+++ b/duniter4j-es-assembly/src/test/misc/test_docstat.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+curl -XPOST 'http://localhost:9200/docstat/record' -d '
+ {
+ "index":"user",
+ "type":"profile",
+ "count":874,
+ "time":1505297350
+ }'
+
+
+curl -XPOST 'http://localhost:9200/docstat/record/_search?pretty' -d '
+ {
+ "size": 0
+ }'
diff --git a/duniter4j-es-assembly/src/test/misc/test_scroll.sh b/duniter4j-es-assembly/src/test/misc/test_scroll.sh
new file mode 100755
index 00000000..be6a65f8
--- /dev/null
+++ b/duniter4j-es-assembly/src/test/misc/test_scroll.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#curl -XPOST 'https://g1-test.data.duniter.fr/user/profile/_search?pretty' -d '
+# {
+# "query":{"bool":{"should":{"range":{"time":{"gte":0}}}}},
+# "from":0,
+# "scroll":"1m",
+# "size": 0
+# }'
+
+
+#curl -XPOST 'https://g1.data.duniter.fr/subscription/execution/_search?pretty' -d '
+# {
+# "query":{"bool":{"should":{"range":{"time":{"gte":0}}}}},
+# "size": 1000,
+# "sort": "time"
+# }'
+
+
+#curl -XPOST 'http://localhost:9200/user/profile/_search/scroll?scroll=1m' -d 'cXVlcnlUaGVuRmV0Y2g7Mzs4OTU6dU5jU2NMeFlRRi0xbVZGSlVxc3dndzs4OTY6dU5jU2NMeFlRRi0xbVZGSlVxc3dndzs4OTQ6dU5jU2NMeFlRRi0xbVZGSlVxc3dndzswOw=='
+
+curl -XPOST 'http://localhost:9200/history/delete/_search?scroll=1m'
+
+curl -XPOST 'http://localhost:9200/history/delete/_search/scroll?scroll=1m' -d 'cXVlcnlUaGVuRmV0Y2g7Mjs3MToxNlZjRUplMVMyaW1sZERvdVU2dHZnOzcyOjE2VmNFSmUxUzJpbWxkRG91VTZ0dmc7MDs='
\ No newline at end of file
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 877e82a2..d4c2f71e 100644
--- a/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-core/src/test/es-home/config/elasticsearch.yml
@@ -178,4 +178,4 @@ duniter.mail.admin: blavenie@EIS-DEV
#
# Websocket port (usefull for listen changes)
#
-duniter.ws.port: 9400
+duniter.ws.port: 9400-9410
diff --git a/duniter4j-es-core/src/test/es-home/config/logging.yml b/duniter4j-es-core/src/test/es-home/config/logging.yml
index 15cfa3e1..82ce0a22 100644
--- a/duniter4j-es-core/src/test/es-home/config/logging.yml
+++ b/duniter4j-es-core/src/test/es-home/config/logging.yml
@@ -21,9 +21,10 @@ logger:
org.duniter.elasticsearch: DEBUG
duniter : DEBUG
- duniter.network.p2p: TRACE
+ #duniter.network.p2p: TRACE
security: DEBUG
+ cluster.routing.allocation: ERROR
org.nuiton.i18n: WARN
org.nuiton.config: WARN
diff --git a/duniter4j-es-core/src/test/java/org/duniter/elasticsearch/service/BlockchainServiceTest.java b/duniter4j-es-core/src/test/java/org/duniter/elasticsearch/service/BlockchainServiceTest.java
index f4238c0e..f588718d 100644
--- a/duniter4j-es-core/src/test/java/org/duniter/elasticsearch/service/BlockchainServiceTest.java
+++ b/duniter4j-es-core/src/test/java/org/duniter/elasticsearch/service/BlockchainServiceTest.java
@@ -30,10 +30,7 @@ import org.duniter.core.client.model.bma.jackson.JacksonUtils;
import org.duniter.core.client.model.local.Peer;
import org.duniter.core.client.service.bma.BlockchainRemoteService;
import org.duniter.elasticsearch.TestResource;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,6 +62,8 @@ public class BlockchainServiceTest {
}
@Test
+ // Ignoring (too long !)
+ @Ignore
public void indexLastBlocks() {
service.indexLastBlocks(peer);
}
diff --git a/duniter4j-es-core/src/test/resources/log4j.properties b/duniter4j-es-core/src/test/resources/log4j.properties
index 2712b72e..374f00b6 100644
--- a/duniter4j-es-core/src/test/resources/log4j.properties
+++ b/duniter4j-es-core/src/test/resources/log4j.properties
@@ -11,7 +11,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - [%t] %m
log4j.logger.org.duniter=INFO
#log4j.logger.org.duniter=DEBUG
log4j.logger.org.duniter.core=WARN
-log4j.logger.org.duniter.elasticsearch=DEBUG
+#log4j.logger.org.duniter.elasticsearch=DEBUG
# Other frameworks levels
log4j.logger.org.elasticsearch=INFO
diff --git a/duniter4j-es-subscription/src/test/es-home/config/logging.yml b/duniter4j-es-subscription/src/test/es-home/config/logging.yml
index 15cfa3e1..e3ec6745 100644
--- a/duniter4j-es-subscription/src/test/es-home/config/logging.yml
+++ b/duniter4j-es-subscription/src/test/es-home/config/logging.yml
@@ -17,16 +17,24 @@ logger:
org.apache.http: INFO
org.duniter: INFO
+ #org.duniter.elasticsearch: DEBUG
- org.duniter.elasticsearch: DEBUG
+ duniter : INFO
+ #duniter.network.p2p: TRACE
- duniter : DEBUG
- duniter.network.p2p: TRACE
-
- security: DEBUG
+ security: INFO
+ cluster.metadata: ERROR
+ cluster.routing.allocation: ERROR
org.nuiton.i18n: WARN
org.nuiton.config: WARN
+ org.nuiton.i18n: ERROR
+ org.nuiton.config: ERROR
+ org.nuiton.converter: WARN
+ org.apache.http: WARN
+ org.apache.http.client: ERROR
+ org.glassfish.grizzly: WARN
+ org.glassfish.tyrus: WARN
# gateway
#gateway: DEBUG
diff --git a/duniter4j-es-user/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-user/src/test/es-home/config/elasticsearch.yml
index a4d76355..377ed516 100644
--- a/duniter4j-es-user/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-user/src/test/es-home/config/elasticsearch.yml
@@ -208,7 +208,7 @@ duniter.mail.admin: 'benoit.lavenier@e-is.pro'
#
# Websocket port (usefull for listen changes)
#
-duniter.ws.port: 9400
+duniter.ws.port: 9400-9410
# ---------------------------------- Duniter4j Subscription module -------------------
#
diff --git a/duniter4j-es-user/src/test/es-home/config/logging.yml b/duniter4j-es-user/src/test/es-home/config/logging.yml
index 15cfa3e1..9e7d36a4 100644
--- a/duniter4j-es-user/src/test/es-home/config/logging.yml
+++ b/duniter4j-es-user/src/test/es-home/config/logging.yml
@@ -17,16 +17,22 @@ logger:
org.apache.http: INFO
org.duniter: INFO
-
- org.duniter.elasticsearch: DEBUG
-
- duniter : DEBUG
- duniter.network.p2p: TRACE
-
- security: DEBUG
-
- org.nuiton.i18n: WARN
- org.nuiton.config: WARN
+ #org.duniter.elasticsearch: DEBUG
+
+ duniter : INFO
+ #duniter.network.p2p: TRACE
+
+ security: INFO
+ cluster.metadata: ERROR
+ cluster.routing.allocation: ERROR
+
+ org.nuiton.i18n: ERROR
+ org.nuiton.config: ERROR
+ org.nuiton.converter: WARN
+ org.apache.http: WARN
+ org.apache.http.client: ERROR
+ org.glassfish.grizzly: WARN
+ org.glassfish.tyrus: WARN
# gateway
#gateway: DEBUG
--
GitLab