mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-30 17:53:21 -04:00 
			
		
		
		
	Make CoreDNS a server type plugin for Caddy (#220)
* Make CoreDNS a server type plugin for Caddy Remove code we don't need and port all middleware over. Fix all tests and rework the documentation. Also make `go generate` build a caddy binary which we then copy into our directory. This means `go build`-builds remain working as-is. And new etc instances in each etcd test for better isolation. Fix more tests and rework test.Server with the newer support Caddy offers. Fix Makefile to support new mode of operation.
This commit is contained in:
		| @@ -2,10 +2,45 @@ package middleware | ||||
|  | ||||
| import ( | ||||
| 	"io" | ||||
| 	"strconv" | ||||
|  | ||||
| 	"github.com/mholt/caddy" | ||||
| 	"gopkg.in/natefinch/lumberjack.v2" | ||||
| ) | ||||
|  | ||||
| func ParseRoller(c *caddy.Controller) (*LogRoller, error) { | ||||
| 	var size, age, keep int | ||||
| 	// This is kind of a hack to support nested blocks: | ||||
| 	// As we are already in a block: either log or errors, | ||||
| 	// c.nesting > 0 but, as soon as c meets a }, it thinks | ||||
| 	// the block is over and return false for c.NextBlock. | ||||
| 	for c.NextBlock() { | ||||
| 		what := c.Val() | ||||
| 		if !c.NextArg() { | ||||
| 			return nil, c.ArgErr() | ||||
| 		} | ||||
| 		value := c.Val() | ||||
| 		var err error | ||||
| 		switch what { | ||||
| 		case "size": | ||||
| 			size, err = strconv.Atoi(value) | ||||
| 		case "age": | ||||
| 			age, err = strconv.Atoi(value) | ||||
| 		case "keep": | ||||
| 			keep, err = strconv.Atoi(value) | ||||
| 		} | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
| 	} | ||||
| 	return &LogRoller{ | ||||
| 		MaxSize:    size, | ||||
| 		MaxAge:     age, | ||||
| 		MaxBackups: keep, | ||||
| 		LocalTime:  true, | ||||
| 	}, nil | ||||
| } | ||||
|  | ||||
| // LogRoller implements a middleware that provides a rolling logger. | ||||
| type LogRoller struct { | ||||
| 	Filename   string | ||||
|   | ||||
		Reference in New Issue
	
	Block a user