From 4e3c0f7c3589c65b895caca887a13dc76fbe58b8 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Sat, 29 Sep 2018 06:39:23 +0700 Subject: rescached: load and watch "file.resolvconf" only if its not empty --- rescached.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rescached.go b/rescached.go index 8a8b8e6..de95771 100644 --- a/rescached.go +++ b/rescached.go @@ -56,12 +56,16 @@ func New(opts *Options) (*Server, error) { opts: opts, } - err := srv.loadResolvConf() - if err != nil { - log.Printf("! loadResolvConf: %s\n", err) + if len(srv.opts.FileResolvConf) == 0 { srv.nsParents = srv.opts.NSParents } else { - fmt.Printf("= Name servers fallback: %v\n", srv.opts.NSParents) + err := srv.loadResolvConf() + if err != nil { + log.Printf("! loadResolvConf: %s\n", err) + srv.nsParents = srv.opts.NSParents + } else { + fmt.Printf("= Name servers fallback: %v\n", srv.opts.NSParents) + } } srv.dnsServer.Handler = srv @@ -166,7 +170,9 @@ func (srv *Server) Start() (err error) { } } - go srv.watchResolvConf() + if len(srv.opts.FileResolvConf) > 0 { + go srv.watchResolvConf() + } go srv.cw.start() go srv.processRequestQueue() -- cgit v1.3