diff --git a/duniter4j-es-assembly/src/main/assembly/config/logging.yml b/duniter4j-es-assembly/src/main/assembly/config/logging.yml index bfd016488194db303cbd54e87ac29a4b8e6072f0..2d99c7711fd78f5f7d83a1d3db174d4ab1617722 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 385488bb39982def8708fadb5fba6eff439d0385..c8928b706bd01deceb3c086cac7a0160324fe8d0 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 0676ba194a3bcdbfd93bbce8fcc76fcbd88d19c0..156875ec5df05c0aeee1be837d2c852790f9ebf9 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 0000000000000000000000000000000000000000..a46e72ab026858ca5d4aa39f035ff45e8ddcc72b --- /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 0000000000000000000000000000000000000000..be6a65f80d000d5a8c5ef4e5177bf93909aa229a --- /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 877e82a2148aea9380eca88653fd33a8d89ac061..d4c2f71eb580dab82eaaf85d3fb96baae231aa5a 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 15cfa3e195cb46a62c7536f118d1684acfcc2ecf..82ce0a22c787d8b24a4044b9d058edd2890af78e 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 f4238c0e48641e297f21b35e5b09a02e95bede1b..f588718d44a0732eeb81aa069185987fa15d33e2 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 2712b72e0f06c247e8b96a4b1265f95105fda739..374f00b62bd11850d2bdc7ced33b5f966aa7681e 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 15cfa3e195cb46a62c7536f118d1684acfcc2ecf..e3ec67452e065dee23b0cf42769676c0ac5baa20 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 a4d7635529d94fe6412653d17a54016b72598de9..377ed516fd2c6d8bc187d96426eeaafea9e6e2ec 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 15cfa3e195cb46a62c7536f118d1684acfcc2ecf..9e7d36a4db818c4d8d488430427389a8d356d011 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