mirror of
https://github.com/grafana/grafana.git
synced 2026-09-05 04:40:13 -05:00
Macaron cleanup (#37795)
* 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:
@@ -10,8 +10,8 @@ import (
|
||||
)
|
||||
|
||||
type Router interface {
|
||||
Handle(method, pattern string, handlers []macaron.Handler) *macaron.Route
|
||||
Get(pattern string, handlers ...macaron.Handler) *macaron.Route
|
||||
Handle(method, pattern string, handlers []macaron.Handler)
|
||||
Get(pattern string, handlers ...macaron.Handler)
|
||||
}
|
||||
|
||||
// RouteRegister allows you to add routes and macaron.Handlers
|
||||
|
||||
@@ -12,24 +12,20 @@ type fakeRouter struct {
|
||||
route []route
|
||||
}
|
||||
|
||||
func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler) *macaron.Route {
|
||||
func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler) {
|
||||
fr.route = append(fr.route, route{
|
||||
pattern: pattern,
|
||||
method: method,
|
||||
handlers: handlers,
|
||||
})
|
||||
|
||||
return &macaron.Route{}
|
||||
}
|
||||
|
||||
func (fr *fakeRouter) Get(pattern string, handlers ...macaron.Handler) *macaron.Route {
|
||||
func (fr *fakeRouter) Get(pattern string, handlers ...macaron.Handler) {
|
||||
fr.route = append(fr.route, route{
|
||||
pattern: pattern,
|
||||
method: http.MethodGet,
|
||||
handlers: handlers,
|
||||
})
|
||||
|
||||
return &macaron.Route{}
|
||||
}
|
||||
|
||||
func emptyHandlers(n int) []macaron.Handler {
|
||||
|
||||
Reference in New Issue
Block a user