Redo settings a bit, move a lot of init logic to main.go

This commit is contained in:
Tyler
2020-01-25 13:48:26 -05:00
parent 991ae3ecb5
commit f726a5d5ae
12 changed files with 152 additions and 394 deletions

View File

@ -68,10 +68,6 @@ func NewResolver(c settings.ResolvSettings) *Resolver {
}
}
if len(c.DOHServer) > 0 {
r.servers = append([]string{c.DOHServer}, r.servers...)
}
return r
}
@ -141,8 +137,7 @@ func (r *Resolver) parseServerListFile(buf *os.File) {
}
func (r *Resolver) ReadServerListFile(path string) {
files := strings.Split(path, ";")
func (r *Resolver) ReadServerListFile(files []string) {
for _, file := range files {
buf, err := os.Open(file)
if err != nil {