NeonXP/gmifs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't hardcode cache; use logprefix

Browse source
This commit is contained in:
dre 2021-07-10 01:41:50 +08:00
parent 6449637324
commit 8653fa5c4d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.go
View file

@ -70,9 +70,11 @@ func main() {
os.Exit(1) os.Exit(1)
} }
logprefix := host + " "
mux := gemini.NewMux() mux := gemini.NewMux()
mux.Use(middleware.Logger(flogger)) mux.Use(middleware.Logger(flogger, logprefix))
mux.Use(middleware.Cache(64)) mux.Use(middleware.Cache(cache))
mux.Handle(gemini.HandlerFunc(fileserver.Serve(root, autoindex))) mux.Handle(gemini.HandlerFunc(fileserver.Serve(root, autoindex)))
server := &gemini.Server{ server := &gemini.Server{

8
middleware/logger.go
View file

@ -3,14 +3,13 @@ package middleware
import ( import (
"fmt" "fmt"
"log" "log"
"os"
"strings" "strings"
"time" "time"
"github.com/n0x1m/gmifs/gemini" "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 { return func(next gemini.Handler) gemini.Handler {
fn := func(w gemini.ResponseWriter, r *gemini.Request) { fn := func(w gemini.ResponseWriter, r *gemini.Request) {
t := time.Now() t := time.Now()
@ -20,9 +19,8 @@ func Logger(log *log.Logger) func(gemini.Handler) gemini.Handler {
ri.Flush() ri.Flush()
ip := strings.Split(r.RemoteAddr, ":")[0] ip := strings.Split(r.RemoteAddr, ":")[0]
hostname, _ := os.Hostname() fmt.Fprintf(log.Writer(), "%s%s - - [%s] \"%s\" %d - %v\n",
fmt.Fprintf(log.Writer(), "%s %s - - [%s] \"%s\" %d - %v\n", prefix,
hostname,
ip, ip,
t.Format("02/Jan/2006:15:04:05 -0700"), t.Format("02/Jan/2006:15:04:05 -0700"),
r.URL.Path, r.URL.Path,