From 2b6c8a05219ffbd4b291a8fb917ded5d8b8e58dd Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 2 Oct 2017 16:34:58 +0200
Subject: [PATCH] fix doc. updagrade to libsodium 1.0.14
---
README.md | 10 ++--
.../src/test/es-home/config/elasticsearch.yml | 2 +-
.../src/test/misc/test_docstat.sh | 49 ++++++++++++++-----
.../elasticsearch/synchro/SynchroService.java | 4 +-
4 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index c59d6248..8619106f 100644
--- a/README.md
+++ b/README.md
@@ -37,19 +37,19 @@ Duniter4j has tree main components :
sudo apt-get install openjdk-8-jre
```
-#### Install libsodium
+### Install libsodium
[The Sodium crypto library (libsodium)](https://download.libsodium.org/doc/installation/) is a modern, easy-to-use software library for encryption, decryption, signatures, password hashing and more.
-- Get libsodium
+- Get libsodium (version 1.0.11 or newer)
```
- wget -kL https://github.com/jedisct1/libsodium/releases/download/1.0.11/libsodium-1.0.11.tar.gz
- tar -xvf libsodium-1.0.11.tar.gz
+ wget -kL https://github.com/jedisct1/libsodium/releases/download/1.0.14/libsodium-1.0.14.tar.gz
+ tar -xvf libsodium-1.0.14.tar.gz
```
- Installation:
```
- cd libsodium-1.0.11
+ cd libsodium-1.0.14
sudo apt-get install build-essential
sudo ./configure
sudo make && make check
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 f28a4763..3b541e42 100644
--- a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
@@ -162,7 +162,7 @@ duniter.security.enable: true
#
# Enable P2P synchronize between ES peers ? (default: true)
#
-# duniter.p2p.enable: false
+# duniter.p2p.enable: true
#
# Enable P2P websocket direct synchronisation ? (default: true)
#
diff --git a/duniter4j-es-assembly/src/test/misc/test_docstat.sh b/duniter4j-es-assembly/src/test/misc/test_docstat.sh
index a46e72ab..408b4458 100755
--- a/duniter4j-es-assembly/src/test/misc/test_docstat.sh
+++ b/duniter4j-es-assembly/src/test/misc/test_docstat.sh
@@ -1,15 +1,38 @@
-#!/bin/sh
-curl -XPOST 'http://localhost:9200/docstat/record' -d '
+curl -XPOST 'https://g1-test.data.duniter.fr/docstat/record/_search?pretty' -d '
{
- "index":"user",
- "type":"profile",
- "count":874,
- "time":1505297350
- }'
-
-
-curl -XPOST 'http://localhost:9200/docstat/record/_search?pretty' -d '
- {
- "size": 0
- }'
+ "size": 0,
+ "aggs": {
+ "range": {
+ "range": {
+ "field": "time",
+ "ranges": [
+ {"from":1506016800, "to": 1506178800 }
+ ]
+ },
+ "aggs": {
+ "index": {
+ "terms": {
+ "field": "index",
+ "size": 0
+ },
+ "aggs" : {
+ "type": {
+ "terms": {
+ "field": "indexType",
+ "size": 0
+ },
+ "aggs": {
+ "max" : {
+ "max" : {
+ "field" : "count"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }'
\ No newline at end of file
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/synchro/SynchroService.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/synchro/SynchroService.java
index 29073c50..0c126106 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/synchro/SynchroService.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/synchro/SynchroService.java
@@ -70,7 +70,7 @@ public class SynchroService extends AbstractService {
private static final String WS_CHANGES_URL = "/ws/_changes";
private HttpService httpService;
- private NetworkService networkService;
+ //private NetworkService networkService;
private final Set<EndpointApi> peerApiFilters = Sets.newHashSet();
private final ThreadPool threadPool;
private final PeerDao peerDao;
@@ -95,7 +95,7 @@ public class SynchroService extends AbstractService {
this.synchroExecutionDao = synchroExecutionDao;
threadPool.scheduleOnStarted(() -> {
httpService = serviceLocator.getHttpService();
- networkService = serviceLocator.getNetworkService();
+ //networkService = serviceLocator.getNetworkService();
setIsReady(true);
});
}
--
GitLab