homelab/traefik
1
0
Fork 0
Code Activity

Dynamic Configuration Refactoring

Browse source
This commit is contained in:
Ludovic Fernandez 2018-11-14 10:18:03 +01:00 • committed by Traefiker Bot
parent d3ae88f108
commit a09dfa3ce1
452 changed files with 21023 additions and 9419 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rules/rules.go
View file

@ -10,9 +10,8 @@ import (
"github.com/containous/mux"
"github.com/containous/traefik/hostresolver"
"github.com/containous/traefik/log"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/types"
"github.com/containous/traefik/old/middlewares"
"github.com/containous/traefik/old/types"
)
// Rules holds rule parsing and configuration
@ -39,7 +38,8 @@ func (r *Rules) host(hosts ...string) *mux.Route {
if strings.EqualFold(reqH, host) || strings.EqualFold(flatH, host) {
return true
}
log.Debugf("CNAMEFlattening: request %s which resolved to %s, is not matched to route %s", reqH, flatH, host)
// FIXME
//log.Debugf("CNAMEFlattening: request %s which resolved to %s, is not matched to route %s", reqH, flatH, host)
}
return false
}

7
rules/rules_test.go
View file

@ -6,9 +6,9 @@ import (
"testing"
"github.com/containous/mux"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/old/middlewares"
"github.com/containous/traefik/old/types"
"github.com/containous/traefik/testhelpers"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -117,7 +117,7 @@ func TestParseDomains(t *testing.T) {
}
}
func TestPriorites(t *testing.T) {
func TestPriorities(t *testing.T) {
router := mux.NewRouter()
router.StrictSlash(true)
@ -253,7 +253,6 @@ func TestHostRegexp(t *testing.T) {
func TestParseInvalidSyntax(t *testing.T) {
router := mux.NewRouter()
router.StrictSlash(true)
rules := &Rules{Route: &types.ServerRoute{Route: router.NewRoute()}}
expression01 := "Path: /path1;Query:param_one=true, /path2"