Merge pull request #133 from linki/tame-logger

Reduce the amount logged by the caller feature
linki · Jul 29, 2019 · 5fc7b8c · 5fc7b8c
2 parents 2a1dbfa + fa3aa5a
commit 5fc7b8c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -7,7 +7,9 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"path"
 	"regexp"
+	"runtime"
 	"syscall"
 	"time"
 
@@ -83,8 +85,11 @@ func main() {
 		log.SetLevel(log.DebugLevel)
 	}
 
-	if logFormat == "json" {
-		log.SetFormatter(&log.JSONFormatter{})
+	switch logFormat {
+	case "json":
+		log.SetFormatter(&log.JSONFormatter{CallerPrettyfier: prettifyCaller})
+	default:
+		log.SetFormatter(&log.TextFormatter{CallerPrettyfier: prettifyCaller})
 	}
 
 	log.SetReportCaller(logCaller)
@@ -270,6 +275,11 @@ func serveMetrics() {
 	}
 }
 
+func prettifyCaller(f *runtime.Frame) (string, string) {
+	_, filename := path.Split(f.File)
+	return "", fmt.Sprintf("%s:%d", filename, f.Line)
+}
+
 var adminPage = `<html>
 	<head>
 		<title>chaoskube</title>