From 7fcbba0f53fae506defd95e0b06505ffed535c56 Mon Sep 17 00:00:00 2001
From: Faissal Elamraoui <amr.faissal@gmail.com>
Date: Sun, 20 Nov 2016 11:54:12 +0100
Subject: [PATCH] Initialize the logger templates inside the logger singleton
 once (and only once)

---
 logger.go | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/logger.go b/logger.go
index 9689a00..e9e081f 100644
--- a/logger.go
+++ b/logger.go
@@ -64,28 +64,26 @@ var (
 	debugLogRecordTemplate *template.Template
 )
 
-func init() {
-	var (
-		err             error
-		simpleLogFormat = `{{Now "2006/01/02 15:04:05"}} {{.Level}} ▶ {{.ID}} {{.Message}}{{EndLine}}`
-		debugLogFormat  = `{{Now "2006/01/02 15:04:05"}} {{.Level}} ▶ {{.ID}} {{.Filename}}:{{.LineNo}} {{.Message}}{{EndLine}}`
-	)
-
-	// Initialize and parse logging templates
-	funcs := template.FuncMap{
-		"Now":     Now,
-		"EndLine": EndLine,
-	}
-	logRecordTemplate, err = template.New("logRecordTemplate").Funcs(funcs).Parse(simpleLogFormat)
-	MustCheck(err)
-	debugLogRecordTemplate, err = template.New("dbgLogRecordTemplate").Funcs(funcs).Parse(debugLogFormat)
-	MustCheck(err)
-}
-
 // GetBeeLogger initializes the logger instance with a NewColorWriter output
 // and returns a singleton
 func GetBeeLogger(w io.Writer) *BeeLogger {
 	once.Do(func() {
+		var (
+			err             error
+			simpleLogFormat = `{{Now "2006/01/02 15:04:05"}} {{.Level}} ▶ {{.ID}} {{.Message}}{{EndLine}}`
+			debugLogFormat  = `{{Now "2006/01/02 15:04:05"}} {{.Level}} ▶ {{.ID}} {{.Filename}}:{{.LineNo}} {{.Message}}{{EndLine}}`
+		)
+
+		// Initialize and parse logging templates
+		funcs := template.FuncMap{
+			"Now":     Now,
+			"EndLine": EndLine,
+		}
+		logRecordTemplate, err = template.New("simpleLogFormat").Funcs(funcs).Parse(simpleLogFormat)
+		MustCheck(err)
+		debugLogRecordTemplate, err = template.New("debugLogFormat").Funcs(funcs).Parse(debugLogFormat)
+		MustCheck(err)
+
 		instance = &BeeLogger{output: NewColorWriter(w)}
 	})
 	return instance