From 707faf57b54967a384bf46196b79ff8ec80c79b1 Mon Sep 17 00:00:00 2001
From: Mak Muftic <mak@nodefactory.io>
Date: Wed, 15 Sep 2021 15:11:34 +0200
Subject: [PATCH] Code cleanup

---
 node/modules/lp2p/pubsub.go                    | 4 +++-
 node/modules/tracer/elasticsearch_transport.go | 9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go
index 7f2a4d678..6656abf01 100644
--- a/node/modules/lp2p/pubsub.go
+++ b/node/modules/lp2p/pubsub.go
@@ -374,7 +374,9 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) {
 		}
 		jsonTransport := tracer.NewJsonTracerTransport(out)
 		transports = append(transports, jsonTransport)
-	} else if in.Cfg.ElasticSearchTracer != "" {
+	}
+
+	if in.Cfg.ElasticSearchTracer != "" {
 		elasticSearchTransport, err := tracer.NewElasticSearchTransport()
 		if err != nil {
 			return nil, err
diff --git a/node/modules/tracer/elasticsearch_transport.go b/node/modules/tracer/elasticsearch_transport.go
index f45dd9ef5..8e214a4e9 100644
--- a/node/modules/tracer/elasticsearch_transport.go
+++ b/node/modules/tracer/elasticsearch_transport.go
@@ -8,10 +8,11 @@ import (
 
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
-	logging "github.com/ipfs/go-log/v2"
 )
 
-var rpclog = logging.Logger("elasticsearch")
+const (
+	ElasticSearch_INDEX = "pubsub"
+)
 
 func NewElasticSearchTransport() (TracerTransport, error) {
 	es, err := elasticsearch.NewDefaultClient()
@@ -31,7 +32,7 @@ type elasticSearchTransport struct {
 
 func (est *elasticSearchTransport) Transport(jsonEvent []byte) error {
 	req := esapi.IndexRequest{
-		Index:      "PeerScore",
+		Index:      ElasticSearch_INDEX,
 		DocumentID: "1", // todo
 		Body:       strings.NewReader(string(jsonEvent)),
 		Refresh:    "true",
@@ -51,8 +52,6 @@ func (est *elasticSearchTransport) Transport(jsonEvent []byte) error {
 		var r map[string]interface{}
 		if err := json.NewDecoder(res.Body).Decode(&r); err != nil {
 			return err
-		} else {
-			rpclog.Infof("[%s] %s; version=%d", res.Status(), r["result"], int(r["_version"].(float64)))
 		}
 	}
 	return nil