diff --git a/main.go b/main.go index edac1a9..5fa9b70 100644 --- a/main.go +++ b/main.go @@ -70,9 +70,11 @@ func main() { os.Exit(1) } + logprefix := host + " " + mux := gemini.NewMux() - mux.Use(middleware.Logger(flogger)) - mux.Use(middleware.Cache(64)) + mux.Use(middleware.Logger(flogger, logprefix)) + mux.Use(middleware.Cache(cache)) mux.Handle(gemini.HandlerFunc(fileserver.Serve(root, autoindex))) server := &gemini.Server{ diff --git a/middleware/logger.go b/middleware/logger.go index 92a4e08..ece5a89 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -3,14 +3,13 @@ package middleware import ( "fmt" "log" - "os" "strings" "time" "github.com/n0x1m/gmifs/gemini" ) -func Logger(log *log.Logger) func(gemini.Handler) gemini.Handler { +func Logger(log *log.Logger, prefix string) func(gemini.Handler) gemini.Handler { return func(next gemini.Handler) gemini.Handler { fn := func(w gemini.ResponseWriter, r *gemini.Request) { t := time.Now() @@ -20,9 +19,8 @@ func Logger(log *log.Logger) func(gemini.Handler) gemini.Handler { ri.Flush() ip := strings.Split(r.RemoteAddr, ":")[0] - hostname, _ := os.Hostname() - fmt.Fprintf(log.Writer(), "%s %s - - [%s] \"%s\" %d - %v\n", - hostname, + fmt.Fprintf(log.Writer(), "%s%s - - [%s] \"%s\" %d - %v\n", + prefix, ip, t.Format("02/Jan/2006:15:04:05 -0700"), r.URL.Path,