move traceEnabled to logging.IsTraceEnabled

streamingfast · Nov 16, 2020 · ec87d95 · ec87d95
1 parent b781f1b
commit ec87d95
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/rpc/logging.go b/rpc/logging.go
@@ -15,13 +15,11 @@
 package rpc
 
 import (
-	"os"
-
 	"github.com/dfuse-io/logging"
 	"go.uber.org/zap"
 )
 
-var traceEnabled = os.Getenv("TRACE") == "true"
+var traceEnabled = logging.IsTraceEnabled("solana-go", "github.com/dfuse-io/solana-go/rpc")
 var zlog *zap.Logger
 
 func init() {

diff --git a/rpc/ws/client.go b/rpc/ws/client.go
@@ -108,9 +108,11 @@ func (c *Client) handleNewSubscriptionMessage(requestID, subID uint64) {
 }
 
 func (c *Client) handleSubscriptionMessage(subID uint64, message []byte) {
-	zlog.Debug("received subscription message",
-		zap.Uint64("subscription_id", subID),
-	)
+	if traceEnabled {
+		zlog.Debug("received subscription message",
+			zap.Uint64("subscription_id", subID),
+		)
+	}
 
 	c.lock.RLock()
 	sub, found := c.subscriptionByWSSubID[subID]

diff --git a/rpc/ws/logging.go b/rpc/ws/logging.go
@@ -15,14 +15,12 @@
 package ws
 
 import (
-	"os"
-
 	"github.com/dfuse-io/logging"
 	"go.uber.org/zap"
 )
 
-var traceEnabled = os.Getenv("TRACE") == "true"
 var zlog *zap.Logger
+var traceEnabled = logging.IsTraceEnabled("solana-go", "github.com/dfuse-io/solana-go/rpc/ws")
 
 func init() {
 	logging.Register("github.com/dfuse-io/solana-go/rpc/ws", &zlog)

diff --git a/serum/logging.go b/serum/logging.go
@@ -15,14 +15,12 @@
 package serum
 
 import (
-	"os"
-
 	"github.com/dfuse-io/logging"
 	"go.uber.org/zap"
 )
 
-var traceEnabled = os.Getenv("TRACE") != ""
 var zlog = zap.NewNop()
+var traceEnabled = logging.IsTraceEnabled("solana-go", "github.com/dfuse-io/solana-go/serum")
 
 func init() {
 	logging.Register("github.com/dfuse-io/solana-go/serum", &zlog)

diff --git a/system/logging.go b/system/logging.go
@@ -15,13 +15,11 @@
 package system
 
 import (
-	"os"
-
 	"github.com/dfuse-io/logging"
 	"go.uber.org/zap"
 )
 
-var traceEnabled = os.Getenv("TRACE") != ""
+var traceEnabled = logging.IsTraceEnabled("solana-go", "github.com/dfuse-io/solana-go/system")
 var zlog = zap.NewNop()
 
 func init() {