From eabe9bfc5f7d0552140d5fdcc866960316168fc8 Mon Sep 17 00:00:00 2001
From: badim <goloveychuk@mail.ru>
Date: Fri, 5 Aug 2016 13:17:48 +0300
Subject: [PATCH] remove "fit" formatter frmo strings, set disableColors=false
 when env not empty

---
 Gododir/main.go | 2 +-
 v1/env.go       | 2 ++
 v1/init.go      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gododir/main.go b/Gododir/main.go
index cf1d734..1ed8b7f 100644
--- a/Gododir/main.go
+++ b/Gododir/main.go
@@ -210,7 +210,7 @@ func tasks(p *do.Project) {
 	})
 
 	p.Task("isolate", do.S{"build"}, func(c *do.Context) {
-		c.Bash("LOGXI=* LOGXI_FORMAT=fit,maxcol=80,t=04:05.000,context=2 demo", do.M{"$in": "v1/cmd/demo"})
+		c.Bash("LOGXI=* LOGXI_FORMAT=maxcol=80,t=04:05.000,context=2 demo", do.M{"$in": "v1/cmd/demo"})
 	})
 
 	p.Task("install", nil, func(c *do.Context) {
diff --git a/v1/env.go b/v1/env.go
index c61c452..e65b997 100644
--- a/v1/env.go
+++ b/v1/env.go
@@ -161,6 +161,8 @@ func ProcessLogxiColorsEnv(env string) {
 	} else if colors == "*=off" {
 		// disable all colors
 		disableColors = true
+	} else {
+		disableColors = false //overriding value set when isTerminal is false
 	}
 	theme = parseTheme(colors)
 }
diff --git a/v1/init.go b/v1/init.go
index 57c9140..16ee7a2 100644
--- a/v1/init.go
+++ b/v1/init.go
@@ -126,7 +126,7 @@ func setDefaults(isTerminal bool) {
 
 	if isTerminal {
 		defaultLogxiEnv = "*=WRN"
-		defaultLogxiFormatEnv = "happy,fit,maxcol=80,t=15:04:05.000000,context=-1"
+		defaultLogxiFormatEnv = "happy,maxcol=80,t=15:04:05.000000,context=-1"
 		defaultFormat = FormatHappy
 		defaultLevel = LevelWarn
 		defaultTimeFormat = "15:04:05.000000"