Extract internal router creation from server #3204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliens
force-pushed
the
refacto-internal-router
branch
2 times, most recently
from
16e6bd2
to
5840b0a
Compare
nmengin
requested changes
Apr 20, 2018
| var serverMiddlewares []negroni.Handler | ||
|
|
||
| if globalConfiguration.EntryPoints[entryPointName].WhiteList != nil { | ||
| ipWhitelistMiddleware, _ := middlewares.NewIPWhiteLister( |
There was a problem hiding this comment.
WDYT about manaaging the error returned by the function?
| } | ||
|
|
||
| if globalConfiguration.EntryPoints[entryPointName].Auth != nil { | ||
| authMiddleware, _ := mauth.NewAuthenticator(globalConfiguration.EntryPoints[entryPointName].Auth, nil) |
There was a problem hiding this comment.
WDYT about manaaging the error retruned by the function?
mmatur
requested changes
Apr 23, 2018
| } | ||
|
|
||
| // AddRoutes Add routes to the router | ||
| func (r *WithPrefix) AddRoutes(systemRouter *mux.Router) { |
| } | ||
|
|
||
| // AddRouter add a router in the aggregator | ||
| func (r *InternalRouterAggregator) AddRouter(router types.InternalRouter) { |
| } | ||
|
|
||
| // AddRoutes Add routes to the router | ||
| func (r *InternalRouterAggregator) AddRoutes(systemRouter *mux.Router) { |
ping/ping.go
Outdated
|
|
||
| g.terminating = true | ||
| // WithContext causes the ping endpoint to serve non 200 responses. | ||
| func (g *Handler) WithContext(ctx context.Context) { |
ping/ping.go
Outdated
| go func() { | ||
| <-ctx.Done() | ||
| g.terminating = true | ||
| }() | ||
| } | ||
|
|
||
| // AddRoutes add ping routes on a router | ||
| func (g *Handler) AddRoutes(router *mux.Router) { |
server/server.go
Outdated
| @@ -665,8 +671,8 @@ func (s *Server) createTLSConfig(entryPointName string, tlsOption *traefiktls.TL | |||
| if entryPointName == s.globalConfiguration.ACME.EntryPoint { | |||
| checkOnDemandDomain := func(domain string) bool { | |||
| routeMatch := &mux.RouteMatch{} | |||
| router := router.GetHandler() | |||
| match := router.Match(&http.Request{URL: &url.URL{}, Host: domain}, routeMatch) | |||
| rt := router.GetHandler() | |||
There was a problem hiding this comment.
Maybe you could simplify these two lines in one line of code
server/server.go
Outdated
| if s.globalConfiguration.EntryPoints[entryPointName].TLS.CipherSuites != nil { | ||
| // if our list of CipherSuites is defined in the entrypoint config, we can re-initilize the suites list as empty | ||
|
|
||
| //Set the list of CipherSuites if set in the config TOML |
server/server.go
Outdated
|
|
||
| //Set the list of CipherSuites if set in the config TOML | ||
| if s.entryPoints[entryPointName].Configuration.TLS.CipherSuites != nil { | ||
| //if our list of CipherSuites is defined in the entrypoint config, we can re-initilize the suites list as empty |
server/server.go
Outdated
| for entryPointName := range globalConfiguration.EntryPoints { | ||
| router := s.buildDefaultHTTPRouter() | ||
| for entryPointName := range s.entryPoints { | ||
| rt := s.buildDefaultHTTPRouter() |
There was a problem hiding this comment.
I think that you could directly use s.buildDefaultHTTPRouter() in the middlewares.NewHandlerSwitcher function instead of creating a variable.
juliens
force-pushed
the
refacto-internal-router
branch
from
2dd3776
to
e9153c6
Compare
ldez
added
status/3-needs-merge
bot/need-human-merge
and removed
status/2-needs-review
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Build internal router (api, ping, etc...) out of server.go.
Motivation
Separation of concern.
More