Issue-6671: Fixed the order of plugins. (#6729)
* Issue-6671: Fixed the order of plugins. Signed-off-by: osho-20 <yashjainiiita@gmail.com> * Issue-6671: corrected test cases. Signed-off-by: osho-20 <yashjainiiita@gmail.com> * Issue-6671: fixed CoreDNSServerPorts Signed-off-by: osho-20 <yashjainiiita@gmail.com> * Issue-6671: removed unnecessary change. Signed-off-by: osho-20 <yashjainiiita@gmail.com> * Issue-6671: added extra check for error. Signed-off-by: osho-20 <yashjainiiita@gmail.com> --------- Signed-off-by: osho-20 <yashjainiiita@gmail.com>
This commit is contained in:
parent
20c5f55802
commit
2d1ce165a5
3 changed files with 7 additions and 4 deletions
|
@ -263,8 +263,11 @@ func (c *Config) Handlers() []plugin.Handler {
|
|||
return nil
|
||||
}
|
||||
hs := make([]plugin.Handler, 0, len(c.registry))
|
||||
for k := range c.registry {
|
||||
hs = append(hs, c.registry[k])
|
||||
for _, k := range Directives {
|
||||
registry := c.Handler(k)
|
||||
if registry != nil {
|
||||
hs = append(hs, registry)
|
||||
}
|
||||
}
|
||||
return hs
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ func TestHandler(t *testing.T) {
|
|||
if _, err := NewServer("127.0.0.1:53", []*Config{c}); err != nil {
|
||||
t.Errorf("Expected no error for NewServer, got %s", err)
|
||||
}
|
||||
if h := c.Handler("testplugin"); h != tp {
|
||||
if h := c.Handler("local"); h != tp {
|
||||
t.Errorf("Expected testPlugin from Handler, got %T", h)
|
||||
}
|
||||
if h := c.Handler("nothing"); h != nil {
|
||||
|
|
|
@ -17,7 +17,7 @@ func (tp testPlugin) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.
|
|||
return 0, nil
|
||||
}
|
||||
|
||||
func (tp testPlugin) Name() string { return "testplugin" }
|
||||
func (tp testPlugin) Name() string { return "local" }
|
||||
|
||||
func testConfig(transport string, p plugin.Handler) *Config {
|
||||
c := &Config{
|
||||
|
|
Loading…
Add table
Reference in a new issue