Merge pull request #10 from randlabs/improved

Redesign and improvements

Author: mxmauro

.gitignore

@@ -22,4 +22,7 @@
 app
 demo
 
+testdata/*
+!testdata/.gitkeep
+
 vendor/*

console/console_logger.go

@@ -2,4 +2,7 @@ module github.com/randlabs/go-logger
 
 go 1.13
 
-require github.com/gookit/color v1.3.5
+require (
+	github.com/gookit/color v1.5.0
+	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
+)

file_logger/file_logger.go

@@ -1,11 +1,18 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gookit/color v1.3.5 h1:1nszcmDVrfti1Su5fhtuS5YBs/Xs6v8UIi0bJ/2oDHY=
-github.com/gookit/color v1.3.5/go.mod h1:GqqLKF1le3EfrbHbYsYa5WdLqfc/PHMdMRbt6tMnqIc=
+github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw=
+github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/randlabs/server-watchdog-go v1.0.0 h1:Rk0y8scYH/OOZ1IwskwmgS8zA6OXA75ugOdCgaZxIX0=
-github.com/randlabs/server-watchdog-go v1.0.0/go.mod h1:E50+xlCEYqmA/nnJnyPoqCHBenzFEA9KAVChG9/6MpI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw=
+golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

@@ -0,0 +1,77 @@
+package console
+
+import (
+	"io"
+	"os"
+	"sync"
+	"time"
+
+	"github.com/gookit/color"
+	"github.com/randlabs/go-logger/internal/util"
+)
+
+//------------------------------------------------------------------------------
+
+var mtx = sync.Mutex{}
+
+//------------------------------------------------------------------------------
+
+// LogError prints an error message on screen.
+func LogError(now time.Time, msg string, isJSON bool) {
+	if !isJSON {
+		logPrint(os.Stderr, color.Error, now, "ERROR", msg)
+	} else {
+		logPrintJSON(os.Stderr, now, "error", msg)
+	}
+}
+
+// LogWarning prints a warning message on screen.
+func LogWarning(now time.Time, msg string, isJSON bool) {
+	if !isJSON {
+		logPrint(os.Stderr, color.Warn, now, "WARNING", msg)
+	} else {
+		logPrintJSON(os.Stderr, now, "warning", msg)
+	}
+}
+
+// LogInfo prints an information message on screen.
+func LogInfo(now time.Time, msg string, isJSON bool) {
+	if !isJSON {
+		logPrint(os.Stdout, color.Info, now, "INFO", msg)
+	} else {
+		logPrintJSON(os.Stdout, now, "info", msg)
+	}
+}
+
+// LogDebug prints a debug message on screen.
+func LogDebug(now time.Time, msg string, isJSON bool) {
+	if !isJSON {
+		logPrint(os.Stdout, color.Debug, now, "DEBUG", msg)
+	} else {
+		logPrintJSON(os.Stdout, now, "debug", msg)
+	}
+}
+
+//------------------------------------------------------------------------------
+
+func logPrint(w io.Writer, theme *color.Theme, now time.Time, level string, msg string) {
+	// Lock console access
+	mtx.Lock()
+
+	// Print the message prefixed with the timestamp and level
+	color.Fprintf(w, "%v %v %v\n", now.Format("2006-01-02 15:04:05.000"), theme.Sprintf("[%v]", level), msg)
+
+	// Unlock console access
+	mtx.Unlock()
+}
+
+func logPrintJSON(w io.Writer, now time.Time, level string, msg string) {
+	// Lock console access
+	mtx.Lock()
+
+	// Print the message with extra payload
+	color.Fprintf(w, "%v\n", util.AddPayloadToJSON(msg, &now, level))
+
+	// Unlock console access
+	mtx.Unlock()
+}