From d067bc9f0109ad17a9ea368d89e6045f8969f50b Mon Sep 17 00:00:00 2001 From: Matija Petrunic Date: Thu, 16 Sep 2021 15:22:18 +0200 Subject: [PATCH] Move creating and opening file to json transport constructor --- node/modules/lp2p/pubsub.go | 5 ++--- node/modules/tracer/json_transport.go | 9 +++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index d12a3fa1c..0a3f5e042 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "net" - "os" "time" host "github.com/libp2p/go-libp2p-core/host" @@ -368,11 +367,11 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) { var transports []tracer.TracerTransport if in.Cfg.JsonTracerFile != "" { - out, err := os.OpenFile(in.Cfg.JsonTracerFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0660) + jsonTransport, err := tracer.NewJsonTracerTransport(in.Cfg.JsonTracerFile) if err != nil { return nil, err } - jsonTransport := tracer.NewJsonTracerTransport(out) + transports = append(transports, jsonTransport) } if in.Cfg.ElasticSearchTracer != "" { diff --git a/node/modules/tracer/json_transport.go b/node/modules/tracer/json_transport.go index 26537a600..1d5e81f30 100644 --- a/node/modules/tracer/json_transport.go +++ b/node/modules/tracer/json_transport.go @@ -10,10 +10,15 @@ type jsonTracerTransport struct { out *os.File } -func NewJsonTracerTransport(out *os.File) TracerTransport { +func NewJsonTracerTransport(file string) (TracerTransport, error) { + out, err := os.OpenFile(file, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0660) + if err != nil { + return nil, err + } + return &jsonTracerTransport{ out: out, - } + }, nil } func (jtt *jsonTracerTransport) Transport(evt TracerTransportEvent) error {