From 5d2f03f01b3d12721b4cd5a71151d42154c32e41 Mon Sep 17 00:00:00 2001 From: David Schneider Date: Thu, 23 Feb 2023 16:49:37 +0100 Subject: [PATCH] Fix mappings in logrus jetstream adapter Clarify SetLogger call in jetstream Signed-off-by: David Schneider --- setup/jetstream/log.go | 4 ++-- setup/jetstream/nats.go | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup/jetstream/log.go b/setup/jetstream/log.go index 78cd328eb..880f7120b 100644 --- a/setup/jetstream/log.go +++ b/setup/jetstream/log.go @@ -22,11 +22,11 @@ func (l *LogAdapter) Noticef(format string, v ...interface{}) { } func (l *LogAdapter) Warnf(format string, v ...interface{}) { - l.entry.Errorf(format, v...) + l.entry.Warnf(format, v...) } func (l *LogAdapter) Fatalf(format string, v ...interface{}) { - l.entry.Errorf(format, v...) + l.entry.Fatalf(format, v...) } func (l *LogAdapter) Errorf(format string, v ...interface{}) { diff --git a/setup/jetstream/nats.go b/setup/jetstream/nats.go index 31d0623f9..01fec9ad6 100644 --- a/setup/jetstream/nats.go +++ b/setup/jetstream/nats.go @@ -40,7 +40,7 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS } if s.Server == nil { var err error - s.Server, err = natsserver.NewServer(&natsserver.Options{ + opts := &natsserver.Options{ ServerName: "monolith", DontListen: true, JetStream: true, @@ -49,11 +49,12 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS MaxPayload: 16 * 1024 * 1024, NoSigs: true, NoLog: cfg.NoLog, - }) + } + s.Server, err = natsserver.NewServer(opts) if err != nil { panic(err) } - s.SetLogger(NewLogAdapter(), false, false) + s.SetLogger(NewLogAdapter(), opts.Debug, opts.Trace) go func() { process.ComponentStarted() s.Start()