Merge pull request #1 from LobbyLobster/master

monobilisim · Aug 2, 2023 · e9d4432 · e9d4432
2 parents ccade44 + c168d2b
commit e9d4432
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 246 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/README.tr.md b/README.tr.md
diff --git a/backup/dumper.go b/backup/dumper.go
diff --git a/backup/logger.go b/backup/logger.go
diff --git a/backup/minio.go b/backup/minio.go
diff --git a/backup/s3.go b/backup/s3.go
diff --git a/config/config.sample.yml b/config/config.sample.yml
diff --git a/config/params.go b/config/params.go
@@ -2,7 +2,6 @@ package config
 
 import (
 	"flag"
-	log2 "log"
 	"os"
 	"pgsql-backup/log"
 
@@ -67,19 +66,19 @@ func NewParams() (p *Params) {
 	flag.Parse()
 
 	if _, err := os.Stat(*filePath); os.IsNotExist(err) {
-		log2.Fatalf("Configuration file: %s does not exist, %v\n", *filePath, err)
+		log.Fatal("Configuration file: %s does not exist, %v\n", *filePath, err)
 	}
 
 	viper.SetConfigFile(*filePath)
 	viper.SetConfigType("yaml")
 
 	if err := viper.ReadInConfig(); err != nil {
-		log2.Fatalf("Error reading config file, %s", err)
+		log.Fatal("Error reading config file, %s\n", err)
 	}
 
 	err := viper.Unmarshal(&p)
 	if err != nil {
-		log2.Fatalf("Unable to decode into struct, %v\n", err)
+		log.Fatal("Unable to decode into struct, %v\n", err)
 	}
 
 	p.Fqdn, _ = os.Hostname()

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/log/logger.go b/log/logger.go
@@ -2,6 +2,9 @@ package log
 
 import (
 	"os"
+	"runtime"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -34,10 +37,16 @@ func NewLogger(params *Params) (l *Logger) {
 
 	logger := logrus.New()
 	logger.SetFormatter(&logrus.TextFormatter{
-		FullTimestamp:          true,
-		DisableLevelTruncation: true,
-		PadLevelText:           true,
+		ForceColors:     true,
+		FullTimestamp:   true,
+		TimestampFormat: "2006-01-02 15:04:05",
+		CallerPrettyfier: func(f *runtime.Frame) (string, string) {
+			slash := strings.LastIndex(f.File, "/")
+			filename := f.File[slash+1:]
+			return "", "[" + filename + ":" + strconv.Itoa(f.Line) + "]"
+		},
 	})
+	logger.SetReportCaller(true)
 
 	l = &Logger{
 		Params: params,

diff --git a/main.go b/main.go
diff --git a/notify/email.go b/notify/email.go
diff --git a/notify/mattermost.go b/notify/mattermost.go
diff --git a/pgsql-backup.iml b/pgsql-backup.iml