From e20cd0ef27c6abb0f8135c801796d128d81c657c Mon Sep 17 00:00:00 2001
From: Mak Muftic <mak@nodefactory.io>
Date: Wed, 15 Sep 2021 14:58:36 +0200
Subject: [PATCH] Propagate error on creating transport

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

diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go
index c9755a680..7f2a4d678 100644
--- a/node/modules/lp2p/pubsub.go
+++ b/node/modules/lp2p/pubsub.go
@@ -375,7 +375,10 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) {
 		jsonTransport := tracer.NewJsonTracerTransport(out)
 		transports = append(transports, jsonTransport)
 	} else if in.Cfg.ElasticSearchTracer != "" {
-		elasticSearchTransport := tracer.NewElasticSearchTransport()
+		elasticSearchTransport, err := tracer.NewElasticSearchTransport()
+		if err != nil {
+			return nil, err
+		}
 		transports = append(transports, elasticSearchTransport)
 	}
 	lt := tracer.NewLotusTracer(transports, in.Host.ID())
diff --git a/node/modules/tracer/elasticsearch_transport.go b/node/modules/tracer/elasticsearch_transport.go
index 2cba23478..f45dd9ef5 100644
--- a/node/modules/tracer/elasticsearch_transport.go
+++ b/node/modules/tracer/elasticsearch_transport.go
@@ -13,16 +13,16 @@ import (
 
 var rpclog = logging.Logger("elasticsearch")
 
-func NewElasticSearchTransport() TracerTransport {
+func NewElasticSearchTransport() (TracerTransport, error) {
 	es, err := elasticsearch.NewDefaultClient()
 
 	if err != nil {
-		rpclog.Fatalf("Error on creating elastic search client: %+v", err)
+		return nil, err
 	}
 
 	return &elasticSearchTransport{
 		cl: es,
-	}
+	}, nil
 }
 
 type elasticSearchTransport struct {