add option for extended logging

gotify · May 23, 2023 · e33a190 · e33a190
1 parent 62a1c99
commit e33a190
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -52,6 +52,7 @@ type Configuration struct {
 	UploadedImagesDir string `default:"data/images"`
 	PluginsDir        string `default:"data/plugins"`
 	Registration      bool   `default:"false"`
+	ExtendedLogFormat bool   `default:"true"`
 }
 
 func configFiles() []string {

diff --git a/router/router.go b/router/router.go
@@ -175,6 +175,21 @@ func Create(db *database.GormDatabase, vInfo *model.VersionInfo, conf *config.Co
 
 var tokenRegexp = regexp.MustCompile("token=[^&]+")
 
+var logFormat string
+var dateTimeFormat string
+
+func init() {
+	conf := config.Get()
+	fmt.Printf("init() ExtendedLogFormat = %t\n", conf.ExtendedLogFormat)
+	if conf.ExtendedLogFormat == true {
+		logFormat = "%v |%s %3d %s| %13v | %15s |%s %-7s %s %#v\n%s"
+		dateTimeFormat = "2006-01-02 15:04:05 -07:00"
+	} else {
+		logFormat = "[GIN] %v |%s %3d %s| %13v | %15s |%s %-7s %s %#v\n%s"
+		dateTimeFormat = "2006/01/02 - 15:04:05"
+	}
+}
+
 func logFormatter(param gin.LogFormatterParams) string {
 	var statusColor, methodColor, resetColor string
 	if param.IsOutputColor() {
@@ -187,8 +202,8 @@ func logFormatter(param gin.LogFormatterParams) string {
 		param.Latency = param.Latency - param.Latency%time.Second
 	}
 	path := tokenRegexp.ReplaceAllString(param.Path, "token=[masked]")
-	return fmt.Sprintf("[GIN] %v |%s %3d %s| %13v | %15s |%s %-7s %s %#v\n%s",
-		param.TimeStamp.Format("2006/01/02 - 15:04:05"),
+	return fmt.Sprintf(logFormat,
+		param.TimeStamp.Format(dateTimeFormat),
 		statusColor, param.StatusCode, resetColor,
 		param.Latency,
 		param.ClientIP,