feat(mobile): Add filtered log core

berty · Oct 18, 2018 · cda3f0b · cda3f0b
1 parent c9ef00f
commit cda3f0b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 28 deletions.
diff --git a/client/react-native/gomobile/logger.go b/client/react-native/gomobile/logger.go
@@ -3,6 +3,7 @@ package core
 import (
 	"fmt"
 
+	"berty.tech/core/pkg/filteredzap"
 	p2plog "github.com/ipfs/go-log"
 	"github.com/whyrusleeping/go-logging"
 	"go.uber.org/zap"
@@ -111,12 +112,14 @@ func setupLogger(logLevel string, mlogger Logger) error {
 		return err
 	}
 
-	consoleEncoder := zapcore.NewConsoleEncoder(config.EncoderConfig)
-	mobileCore := zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-		return newMobileCore(core, consoleEncoder, mlogger)
+	core := zap.WrapCore(func(core zapcore.Core) zapcore.Core {
+		consoleEncoder := zapcore.NewConsoleEncoder(config.EncoderConfig)
+		mobileCore := newMobileCore(core, consoleEncoder, mlogger)
+		filteredCore := filteredzap.FilterByNamespace(mobileCore, "*")
+		return filteredCore
 	})
 
-	zap.ReplaceGlobals(l.WithOptions(mobileCore))
+	zap.ReplaceGlobals(l.WithOptions(core))
 	logger().Debug("logger initialized")
 
 	// configure p2p log

diff --git a/core/cmd/berty/root.go b/core/cmd/berty/root.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"math/rand"
-	"path"
 	"strings"
 
 	p2plog "github.com/ipfs/go-log"
@@ -128,30 +127,14 @@ func setupLogger(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
+	patternsString, err := cmd.Flags().GetString("log-namespaces")
+	if err != nil {
+		panic(err)
+	}
+
 	filtered := zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-		matchMap := map[string]bool{}
-		patternsString, err := cmd.Flags().GetString("log-namespaces")
-		if err != nil {
-			panic(err)
-		}
-		patterns := strings.Split(patternsString, ",")
-		return filteredzap.NewFilteringCore(core, func(entry zapcore.Entry, fields []zapcore.Field) bool {
-			// always print error messages
-			if entry.Level >= zapcore.ErrorLevel {
-				return true
-			}
-			// only show debug,info,warn messages for enabled --log-namespaces
-			if _, found := matchMap[entry.LoggerName]; !found {
-				matchMap[entry.LoggerName] = false
-				for _, pattern := range patterns {
-					if matched, _ := path.Match(pattern, entry.LoggerName); matched {
-						matchMap[entry.LoggerName] = true
-						break
-					}
-				}
-			}
-			return matchMap[entry.LoggerName]
-		})
+		return filteredzap.FilterByNamespace(core, patternsString)
 	})
 	zap.ReplaceGlobals(l.WithOptions(filtered))
 	logger().Debug("logger initialized")

diff --git a/core/pkg/filteredzap/logger.go b/core/pkg/filteredzap/logger.go
@@ -3,6 +3,9 @@ package filteredzap
 // based on https://github.com/tchap/zapext/blob/a5d992351555de581c6d36e2829287a6d1c2f16a/middleware/core_filtering.go
 
 import (
+	"path"
+	"strings"
+
 	"go.uber.org/zap/zapcore"
 )
 
@@ -35,3 +38,26 @@ func (core *filteringCore) Write(entry zapcore.Entry, fields []zapcore.Field) er
 	}
 	return core.Core.Write(entry, fields)
 }
+
+func FilterByNamespace(core zapcore.Core, namespaces string) zapcore.Core {
+	matchMap := map[string]bool{}
+	patternsString := namespaces
+	patterns := strings.Split(patternsString, ",")
+	return NewFilteringCore(core, func(entry zapcore.Entry, fields []zapcore.Field) bool {
+		// always print error messages
+		if entry.Level >= zapcore.ErrorLevel {
+			return true
+		}
+		// only show debug,info,warn messages for enabled --log-namespaces
+		if _, found := matchMap[entry.LoggerName]; !found {
+			matchMap[entry.LoggerName] = false
+			for _, pattern := range patterns {
+				if matched, _ := path.Match(pattern, entry.LoggerName); matched {
+					matchMap[entry.LoggerName] = true
+					break
+				}
+			}
+		}
+		return matchMap[entry.LoggerName]
+	})
+}