Merge branch '115-tune-logger' into 'master'

Improves "Logging improvements"

See merge request postgres-ai/database-lab!301

Author: viktor-postgres-ai

cmd/cli/main.go

@@ -93,7 +93,7 @@ func main() {
 
 // loadEnvironmentParams loads environment params from a Database Lab's config file.
 func loadEnvironmentParams(c *cli.Context) error {
-	dblabLog.DEBUG = c.IsSet("debug")
+	dblabLog.SetDebug(c.IsSet("debug"))
 
 	filename, err := config.GetFilename()
 	if err != nil {

cmd/database-lab/main.go

@@ -226,7 +226,7 @@ func loadConfiguration(instanceID string) (*config.Config, error) {
 		return nil, errors.Wrap(err, "failed to parse config")
 	}
 
-	log.DEBUG = cfg.Global.Debug
+	log.SetDebug(cfg.Global.Debug)
 	log.Dbg("Config loaded", cfg)
 
 	cfg.Global.InstanceID = instanceID

cmd/runci/main.go

@@ -147,7 +147,7 @@ func loadConfiguration() (*runci.Config, error) {
 		return nil, errors.WithMessagef(err, "error parsing %s config", configPath)
 	}
 
-	log.DEBUG = cfg.App.Debug
+	log.SetDebug(cfg.App.Debug)
 	log.Dbg("Config loaded: ", cfg)
 
 	return cfg, nil

pkg/log/log.go

@@ -8,9 +8,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"os"
 )
 
-var DEBUG bool = true
+var debugMode bool = true
+
+var std = log.New(os.Stderr, "", log.LstdFlags|log.Lshortfile)
 
 const (
 	WHITE  = "\x1b[1;37m"
@@ -22,6 +25,10 @@ const (
 	FAIL   = RED + "Fail" + END
 )
 
+const (
+	calldepth = 3
+)
+
 func toString(i1 interface{}) string {
 	if i1 == nil {
 		return ""
@@ -66,31 +73,50 @@ func prepareMessage(v ...interface{}) string {
 	return message
 }
 
+func println(v ...interface{}) {
+	_ = std.Output(calldepth, fmt.Sprintln(v...))
+}
+
+func printf(format string, v ...interface{}) {
+	_ = std.Output(calldepth, fmt.Sprintf(format, v...))
+}
+
+// SetDebug enables debug logs.
+func SetDebug(enable bool) {
+	debugMode = enable
+
+	if debugMode {
+		std.SetFlags(log.LstdFlags | log.Lshortfile)
+	} else {
+		std.SetFlags(log.LstdFlags)
+	}
+}
+
 // Output message.
 func Msg(v ...interface{}) {
-	log.Println("[INFO]  " + prepareMessage(v...))
+	println("[INFO]  " + prepareMessage(v...))
 }
 
 // Output debug message.
 func Dbg(v ...interface{}) {
-	if DEBUG {
-		log.Println("[DEBUG] " + prepareMessage(v...))
+	if debugMode {
+		println("[DEBUG] " + prepareMessage(v...))
 	}
 }
 
 // Output error message.
 func Err(v ...interface{}) {
-	log.Println("[ERROR] " + prepareMessage(v...))
+	println("[ERROR] " + prepareMessage(v...))
 }
 
 // Errf outputs formatted log.
 func Errf(format string, v ...interface{}) {
-	log.Printf("[ERROR] "+format, v...)
+	printf("[ERROR] "+format, v...)
 }
 
 // Messages for security audit.
 func Audit(v ...interface{}) {
-	log.Println("[AUDIT] " + prepareMessage(v...))
+	println("[AUDIT] " + prepareMessage(v...))
 }
 
 func Fatal(v ...interface{}) {

pkg/retrieval/engine/postgres/snapshot/physical_test.go

@@ -49,7 +49,7 @@ Minimum recovery ending location:     0/0
 }
 
 func TestWalDir(t *testing.T) {
-	log.DEBUG = false
+	log.SetDebug(false)
 
 	testCases := []struct {
 		pgVersion      float64
@@ -90,7 +90,7 @@ func TestWalDir(t *testing.T) {
 }
 
 func TestWalCommand(t *testing.T) {
-	log.DEBUG = false
+	log.SetDebug(false)
 
 	testCases := []struct {
 		pgVersion          float64
@@ -131,7 +131,7 @@ func TestWalCommand(t *testing.T) {
 }
 
 func TestParsingWalLine(t *testing.T) {
-	log.DEBUG = false
+	log.SetDebug(false)
 
 	testCases := []struct {
 		line                string