From eebf8d3b6eec57feeb2efa87b5229ad8bdafc861 Mon Sep 17 00:00:00 2001
From: Kevin Franklin Kim <kevin.kim@bestbytes.com>
Date: Mon, 3 Jan 2022 13:29:45 +0100
Subject: [PATCH] feat: add log keys

---
 log/fields_stream.go           | 18 ++++++++++++++++++
 net/stream/jetstream/stream.go | 12 ++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 log/fields_stream.go

diff --git a/log/fields_stream.go b/log/fields_stream.go
new file mode 100644
index 0000000..312ff3a
--- /dev/null
+++ b/log/fields_stream.go
@@ -0,0 +1,18 @@
+package log
+
+import (
+	"go.uber.org/zap"
+)
+
+const (
+	StreamQueueKey   = "queue"
+	StreamSubjectKey = "subject"
+)
+
+func FStreamQueue(queue string) zap.Field {
+	return zap.String(StreamQueueKey, queue)
+}
+
+func FStreamSubject(name string) zap.Field {
+	return zap.String(StreamSubjectKey, name)
+}
diff --git a/net/stream/jetstream/stream.go b/net/stream/jetstream/stream.go
index bc956fd..a8263d1 100644
--- a/net/stream/jetstream/stream.go
+++ b/net/stream/jetstream/stream.go
@@ -98,23 +98,23 @@ func New(l *zap.Logger, name, addr string, opts ...Option) (*Stream, error) {
 	// default options
 	natsOpts := append([]nats.Option{
 		nats.ErrorHandler(func(conn *nats.Conn, subscription *nats.Subscription, err error) {
-			l.Error("Nats server error", log.FError(err))
+			l.Error("nats error", log.FError(err), log.FStreamQueue(subscription.Queue), log.FStreamSubject(subscription.Subject))
 		}),
 		nats.ClosedHandler(func(conn *nats.Conn) {
 			if err := conn.LastError(); err != nil {
-				l.Error("Closed connection to nats server", log.FError(err))
+				l.Error("nats closed", log.FError(err))
 			} else {
-				l.Info("Closed connection to nats server")
+				l.Debug("nats closed")
 			}
 		}),
 		nats.ReconnectHandler(func(conn *nats.Conn) {
-			l.Info("Reconnected to nats server")
+			l.Debug("nats reconnected")
 		}),
 		nats.DisconnectErrHandler(func(conn *nats.Conn, err error) {
 			if err != nil {
-				l.Error("Disconnected from nats server", log.FError(err))
+				l.Error("nats disconnected", log.FError(err))
 			} else {
-				l.Info("Disconnected from nats server")
+				l.Debug("nats disconnected")
 			}
 		}),
 		nats.Timeout(time.Millisecond * 500),