fix(logrusx): prettify on json_pretty only (#182)

ory · Aug 4, 2020 · 59ba571 · 59ba571
1 parent 72978df
commit 59ba571
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/logrusx/logrus.go b/logrusx/logrus.go
@@ -35,9 +35,9 @@ func newLogger(o *options) *logrus.Logger {
 	} else {
 		switch stringsx.Coalesce(o.format, viper.GetString("log.format"), viper.GetString("LOG_FORMAT")) {
 		case "json":
-			l.Formatter = &logrus.JSONFormatter{
-				PrettyPrint: l.IsLevelEnabled(logrus.DebugLevel),
-			}
+			l.Formatter = &logrus.JSONFormatter{PrettyPrint: false}
+		case "json_pretty":
+			l.Formatter = &logrus.JSONFormatter{PrettyPrint: true}
 		default:
 			l.Formatter = &logrus.TextFormatter{
 				DisableQuote:     true,

diff --git a/logrusx/logrus_test.go b/logrusx/logrus_test.go
@@ -42,7 +42,7 @@ func TestOptions(t *testing.T) {
 
 func TestJSONFormatter(t *testing.T) {
 	t.Run("pretty=true", func(t *testing.T) {
-		l := New("logrusx-audit", "v0.0.0", ForceFormat("json"), ForceLevel(logrus.DebugLevel))
+		l := New("logrusx-audit", "v0.0.0", ForceFormat("json_pretty"), ForceLevel(logrus.DebugLevel))
 		var b bytes.Buffer
 		l.Logrus().Out = &b
 
@@ -52,7 +52,7 @@ func TestJSONFormatter(t *testing.T) {
 	})
 
 	t.Run("pretty=false", func(t *testing.T) {
-		l := New("logrusx-audit", "v0.0.0", ForceFormat("json"), ForceLevel(logrus.InfoLevel))
+		l := New("logrusx-audit", "v0.0.0", ForceFormat("json"), ForceLevel(logrus.DebugLevel))
 		var b bytes.Buffer
 		l.Logrus().Out = &b