From b151e98289adcc75e123738f2b135fdd23932545 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Fri, 16 Mar 2018 12:29:47 +0100
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 core/swag.go | 67 ++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/core/swag.go b/core/swag.go
index ee11d0bf..1de2733c 100644
--- a/core/swag.go
+++ b/core/swag.go
@@ -5,6 +5,15 @@ import (
 	"os"
 )
 
+const (
+	DEBUG = iota
+	INFO
+	IMPORTANT
+	WARNING
+	ERROR
+	FATAL
+)
+
 // https://misc.flogisoft.com/bash/tip_colors_and_formatting
 var (
 	BOLD = "\033[1m"
@@ -26,6 +35,24 @@ var (
 
 	RESET = "\033[0m"
 
+	LogLabels = map[int]string{
+		DEBUG:     "dbg",
+		INFO:      "inf",
+		IMPORTANT: "imp",
+		WARNING:   "war",
+		ERROR:     "err",
+		FATAL:     "!!!",
+	}
+
+	LogColors = map[int]string{
+		DEBUG:     DIM + FG_BLACK + BG_DGRAY,
+		INFO:      FG_WHITE + BG_GREEN,
+		IMPORTANT: FG_WHITE + BG_LBLUE,
+		WARNING:   FG_WHITE + BG_YELLOW,
+		ERROR:     FG_WHITE + BG_RED,
+		FATAL:     FG_WHITE + BG_RED + BOLD,
+	}
+
 	HasColors = true
 )
 
@@ -53,46 +80,18 @@ func InitSwag(disableColors bool) {
 		RESET = ""
 
 		LogColors = map[int]string{
-			DEBUG:     DIM + FG_BLACK + BG_DGRAY,
-			INFO:      FG_WHITE + BG_GREEN,
-			IMPORTANT: FG_WHITE + BG_LBLUE,
-			WARNING:   FG_WHITE + BG_YELLOW,
-			ERROR:     FG_WHITE + BG_RED,
-			FATAL:     FG_WHITE + BG_RED + BOLD,
+			DEBUG:     "",
+			INFO:      "",
+			IMPORTANT: "",
+			WARNING:   "",
+			ERROR:     "",
+			FATAL:     "",
 		}
 
 		HasColors = false
 	}
 }
 
-const (
-	DEBUG = iota
-	INFO
-	IMPORTANT
-	WARNING
-	ERROR
-	FATAL
-)
-
-var (
-	LogLabels = map[int]string{
-		DEBUG:     "dbg",
-		INFO:      "inf",
-		IMPORTANT: "imp",
-		WARNING:   "war",
-		ERROR:     "err",
-		FATAL:     "!!!",
-	}
-	LogColors = map[int]string{
-		DEBUG:     DIM + FG_BLACK + BG_DGRAY,
-		INFO:      FG_WHITE + BG_GREEN,
-		IMPORTANT: FG_WHITE + BG_LBLUE,
-		WARNING:   FG_WHITE + BG_YELLOW,
-		ERROR:     FG_WHITE + BG_RED,
-		FATAL:     FG_WHITE + BG_RED + BOLD,
-	}
-)
-
 // W for Wrap
 func W(e, s string) string {
 	return e + s + RESET