mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-31 10:13:14 -04:00 
			
		
		
		
	* plugin/file: make non-existent file non-fatal If the zone file being loaded doesn't exist *and* reload is enabled, just wait the file to pop up in the normal Reload routine. If reload is set to 0s; we keep this a fatal error on startup. Aslo fix the ticker in z.Reload(): remove the per second ticks and just use the reload interval for the ticker. Brush up the documentation a bit as well. Fixes: #2951 Signed-off-by: Miek Gieben <miek@miek.nl> * Stickler and test compile Signed-off-by: Miek Gieben <miek@miek.nl> * Remove there too Signed-off-by: Miek Gieben <miek@miek.nl> * Cant README test these because zone files dont exist Signed-off-by: Miek Gieben <miek@miek.nl>
		
			
				
	
	
		
			65 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			65 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package file
 | |
| 
 | |
| import (
 | |
| 	"os"
 | |
| 	"time"
 | |
| )
 | |
| 
 | |
| // Reload reloads a zone when it is changed on disk. If z.NoReload is true, no reloading will be done.
 | |
| func (z *Zone) Reload() error {
 | |
| 	if z.ReloadInterval == 0 {
 | |
| 		return nil
 | |
| 	}
 | |
| 	tick := time.NewTicker(z.ReloadInterval)
 | |
| 
 | |
| 	go func() {
 | |
| 
 | |
| 		for {
 | |
| 			select {
 | |
| 
 | |
| 			case <-tick.C:
 | |
| 				zFile := z.File()
 | |
| 				reader, err := os.Open(zFile)
 | |
| 				if err != nil {
 | |
| 					log.Errorf("Failed to open zone %q in %q: %v", z.origin, zFile, err)
 | |
| 					continue
 | |
| 				}
 | |
| 
 | |
| 				serial := z.SOASerialIfDefined()
 | |
| 				zone, err := Parse(reader, z.origin, zFile, serial)
 | |
| 				if err != nil {
 | |
| 					if _, ok := err.(*serialErr); !ok {
 | |
| 						log.Errorf("Parsing zone %q: %v", z.origin, err)
 | |
| 					}
 | |
| 					continue
 | |
| 				}
 | |
| 
 | |
| 				// copy elements we need
 | |
| 				z.reloadMu.Lock()
 | |
| 				z.Apex = zone.Apex
 | |
| 				z.Tree = zone.Tree
 | |
| 				z.reloadMu.Unlock()
 | |
| 
 | |
| 				log.Infof("Successfully reloaded zone %q in %q with serial %d", z.origin, zFile, z.Apex.SOA.Serial)
 | |
| 				z.Notify()
 | |
| 
 | |
| 			case <-z.reloadShutdown:
 | |
| 				tick.Stop()
 | |
| 				return
 | |
| 			}
 | |
| 		}
 | |
| 	}()
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // SOASerialIfDefined returns the SOA's serial if the zone has a SOA record in the Apex, or
 | |
| // -1 otherwise.
 | |
| func (z *Zone) SOASerialIfDefined() int64 {
 | |
| 	z.reloadMu.Lock()
 | |
| 	defer z.reloadMu.Unlock()
 | |
| 	if z.Apex.SOA != nil {
 | |
| 		return int64(z.Apex.SOA.Serial)
 | |
| 	}
 | |
| 	return -1
 | |
| }
 |