Merge pull request #177 from MinterTeam/dev

v0.8.2

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.8.2
+*Dec 10th, 2018*
+
+BUG FIXES
+
+- [log] Add json log format
+
 ## 0.8.1
 *Dec 10th, 2018*
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   minter:
-    image: minterteam/minter:0.8.1
+    image: minterteam/minter:0.8.2
     volumes:
       - ~/.minter:/minter
     ports:

log/log.go

@@ -4,6 +4,7 @@ import (
 	"github.com/MinterTeam/minter-go-node/config"
 	"github.com/tendermint/tendermint/libs/cli/flags"
 	"github.com/tendermint/tendermint/libs/log"
+	"io"
 	"os"
 )
 
@@ -13,7 +14,7 @@ var (
 )
 
 func init() {
-	var l log.Logger
+	var dest io.Writer = os.Stdout
 
 	if cfg.LogPath != "stdout" {
 		file, err := os.OpenFile(cfg.LogPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
@@ -22,9 +23,18 @@ func init() {
 			panic(err)
 		}
 
-		l = log.NewTMLogger(file)
-	} else {
-		l = log.NewTMLogger(os.Stdout)
+		dest = file
+	}
+
+	var l log.Logger
+
+	switch cfg.LogFormat {
+	case config.LogFormatJSON:
+		l = log.NewTMJSONLogger(dest)
+	case config.LogFormatPlain:
+		l = log.NewTMLogger(dest)
+	default:
+		panic("unsupported log format")
 	}
 
 	l, err := flags.ParseLogLevel(cfg.LogLevel, l, "info")

version/version.go

@@ -4,12 +4,12 @@ package version
 const (
 	Maj = "0"
 	Min = "8"
-	Fix = "1"
+	Fix = "2"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.8.1"
+	Version = "0.8.2"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string