IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Macaron cleanup (#37795)

Browse Source 
* simplify some dependency injection in macaron
* remove unused internal server error handler from macaron
* remove internal server error handler from the router
* remove unused combo router api
* remove unused parts of the macaron router
This commit is contained in:
Serge Zaitsev
2021-08-30 11:48:34 +02:00
committed by GitHub
parent 74afe809af
commit d15cbe4b4e
9 changed files with 38 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/api/static/static.go
View File

@@ -17,7 +17,6 @@ package httpstatic
import (
"fmt"
"log"
"net/http"
"os"
"path"
@@ -26,6 +25,7 @@ import (
"strings"
"sync"
"github.com/grafana/grafana/pkg/infra/log"
"gopkg.in/macaron.v1"
)
@@ -115,7 +115,7 @@ func prepareStaticOptions(dir string, options []StaticOptions) StaticOptions {
return prepareStaticOption(dir, opt)
}
func staticHandler(ctx *macaron.Context, log *log.Logger, opt StaticOptions) bool {
func staticHandler(ctx *macaron.Context, log log.Logger, opt StaticOptions) bool {
if ctx.Req.Method != "GET" && ctx.Req.Method != "HEAD" {
return false
}
@@ -138,7 +138,7 @@ func staticHandler(ctx *macaron.Context, log *log.Logger, opt StaticOptions) boo
}
defer func() {
if err := f.Close(); err != nil {
log.Printf("Failed to close file: %s\n", err)
log.Error("Failed to close file", "error", err)
}
}()
@@ -171,7 +171,7 @@ func staticHandler(ctx *macaron.Context, log *log.Logger, opt StaticOptions) boo
}
defer func() {
if err := indexFile.Close(); err != nil {
log.Printf("Failed to close file: %s", err)
log.Error("Failed to close file", "error", err)
}
}()
@@ -182,7 +182,7 @@ func staticHandler(ctx *macaron.Context, log *log.Logger, opt StaticOptions) boo
}
if !opt.SkipLogging {
log.Printf("[Static] Serving %s\n", file)
log.Info("[Static] Serving", "file", file)
}
// Add an Expires header to the static content
@@ -198,7 +198,8 @@ func staticHandler(ctx *macaron.Context, log *log.Logger, opt StaticOptions) boo
func Static(directory string, staticOpt ...StaticOptions) macaron.Handler {
opt := prepareStaticOptions(directory, staticOpt)
return func(ctx *macaron.Context, log *log.Logger) {
staticHandler(ctx, log, opt)
logger := log.New("static")
return func(ctx *macaron.Context) {
staticHandler(ctx, logger, opt)
}
}