configurable logs

cmd/main.go

@@ -56,7 +56,7 @@ func runServer(*cli.Context) error {
 	log.Info(">> App begin")
 
 	// Create stream server
-	s, err := datastreamer.New(6900, StSequencer, "streamfile.bin")
+	s, err := datastreamer.New(6900, StSequencer, "streamfile.bin", nil)
 	if err != nil {
 		os.Exit(1)
 	}

datastreamer/config.go

@@ -1,8 +1,12 @@
 package datastreamer
 
+import "github.com/0xPolygonHermez/zkevm-data-streamer/log"
+
 type Config struct {
 	// Port to listen on
 	Port uint16 `mapstructure:"Port"`
 	// Filename of the binary data file
 	Filename string `mapstructure:"Filename"`
+	// Log
+	Log log.Config `mapstructure:"Logs"`
 }

datastreamer/streamserver.go

@@ -107,7 +107,7 @@ type ResultEntry struct {
 	errorStr   []byte
 }
 
-func New(port uint16, streamType StreamType, fileName string) (StreamServer, error) {
+func New(port uint16, streamType StreamType, fileName string, cfg *log.Config) (StreamServer, error) {
 	// Create the server data stream
 	s := StreamServer{
 		port:     port,
@@ -136,6 +136,11 @@ func New(port uint16, streamType StreamType, fileName string) (StreamServer, err
 	// Initialize the data entry number
 	s.nextEntry = s.sf.header.TotalEntries
 
+	// Initialize the logger
+	if cfg != nil {
+		log.Init(*cfg)
+	}
+
 	return s, nil
 }
 

tool/config/config.go

@@ -23,7 +23,6 @@ const (
 type Config struct {
 	StreamServer datastreamer.Config `mapstructure:"StreamServer"`
 	StateDB      db.Config           `mapstructure:"StateDB"`
-	LogConfig    log.Config          `mapstructure:"Log"`
 }
 
 // Default parses the default configuration values.

tool/config/default.go

@@ -5,6 +5,10 @@ const DefaultValues = `
 [StreamServer]
 Port = 8080
 Filename = "datastreamer.bin"
+	[Log]
+	Environment = "development" # "production" or "development"
+	Level = "info"
+	Outputs = ["stderr"]
 
 [StateDB]
 User = "state_user"

tool/config/tool.config.toml

@@ -2,6 +2,10 @@
 [StreamServer]
 Port = 6900
 Filename = "streamfile.bin"
+    [Log]
+    Environment = "development"
+    Level = "info"
+    Outputs = ["stdout"]
 
 [StateDB]
 User = "state_user"
@@ -11,8 +15,3 @@ Host = "localhost"
 Port = "5432"
 EnableLog = false	
 MaxConns = 200
-
-[Log]
-Environment = "development"
-Level = "info"
-Outputs = ["stdout"]

tool/main.go

@@ -68,11 +68,11 @@ func start(cliCtx *cli.Context) error {
 	log.Infof("Loaded configuration: %+v", c)
 
 	// Init logger
-	log.Init(c.LogConfig)
+	log.Init(c.StreamServer.Log)
 	log.Info("Starting tool")
 
 	// Create a stream server
-	streamServer, err := datastreamer.New(c.StreamServer.Port, db.StreamTypeSequencer, c.StreamServer.Filename)
+	streamServer, err := datastreamer.New(c.StreamServer.Port, db.StreamTypeSequencer, c.StreamServer.Filename, &c.StreamServer.Log)
 	if err != nil {
 		log.Fatal(err)
 	}