|
|
|
@ -86,14 +86,14 @@ func LoggerHandler(level log.Level) func(next http.Handler) http.Handler {
|
|
|
|
|
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
|
|
|
|
start := time.Now()
|
|
|
|
|
|
|
|
|
|
_ = log.GetLogger("router").Log(0, level, "Started %s %s for %s", log.ColoredMethod(req.Method), req.RequestURI, req.RemoteAddr)
|
|
|
|
|
_ = log.GetLogger("router").Log(0, level, "Started %s %s for %s", log.ColoredMethod(req.Method), req.URL.RequestURI(), req.RemoteAddr)
|
|
|
|
|
|
|
|
|
|
next.ServeHTTP(w, req)
|
|
|
|
|
|
|
|
|
|
ww := middleware.NewWrapResponseWriter(w, req.ProtoMajor)
|
|
|
|
|
|
|
|
|
|
status := ww.Status()
|
|
|
|
|
_ = log.GetLogger("router").Log(0, level, "Completed %s %s %v %s in %v", log.ColoredMethod(req.Method), req.RequestURI, log.ColoredStatus(status), log.ColoredStatus(status, http.StatusText(status)), log.ColoredTime(time.Since(start)))
|
|
|
|
|
_ = log.GetLogger("router").Log(0, level, "Completed %s %s %v %s in %v", log.ColoredMethod(req.Method), req.URL.RequestURI(), log.ColoredStatus(status), log.ColoredStatus(status, http.StatusText(status)), log.ColoredTime(time.Since(start)))
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -107,12 +107,12 @@ func storageHandler(storageSetting setting.Storage, prefix string, objStore stor
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !strings.HasPrefix(req.RequestURI, "/"+prefix) {
|
|
|
|
|
if !strings.HasPrefix(req.URL.RequestURI(), "/"+prefix) {
|
|
|
|
|
next.ServeHTTP(w, req)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix)
|
|
|
|
|
rPath := strings.TrimPrefix(req.URL.RequestURI(), "/"+prefix)
|
|
|
|
|
u, err := objStore.URL(rPath, path.Base(rPath))
|
|
|
|
|
if err != nil {
|
|
|
|
|
if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
|
|
|
|
@ -139,12 +139,12 @@ func storageHandler(storageSetting setting.Storage, prefix string, objStore stor
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !strings.HasPrefix(req.RequestURI, "/"+prefix) {
|
|
|
|
|
if !strings.HasPrefix(req.URL.RequestURI(), "/"+prefix) {
|
|
|
|
|
next.ServeHTTP(w, req)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix)
|
|
|
|
|
rPath := strings.TrimPrefix(req.URL.RequestURI(), "/"+prefix)
|
|
|
|
|
rPath = strings.TrimPrefix(rPath, "/")
|
|
|
|
|
|
|
|
|
|
fi, err := objStore.Stat(rPath)
|
|
|
|
|