geoip reload support

dmachard · Oct 25, 2023 · 3bddb4c · 3bddb4c
1 parent 199cd0e
commit 3bddb4c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/transformers/geoip.go b/transformers/geoip.go
@@ -63,6 +63,10 @@ func NewDnsGeoIpProcessor(config *dnsutils.ConfigTransformers, logger *logger.Lo
 	return d
 }
 
+func (p *GeoIpProcessor) ReloadConfig(config *dnsutils.ConfigTransformers) {
+	p.config = config
+}
+
 func (p *GeoIpProcessor) LogInfo(msg string, v ...interface{}) {
 	log := fmt.Sprintf("transformer=geoip#%d - ", p.instance)
 	p.logInfo(log+msg, v...)
@@ -86,6 +90,12 @@ func (p *GeoIpProcessor) InitDnsMessage(dm *dnsutils.DnsMessage) {
 }
 
 func (p *GeoIpProcessor) Open() (err error) {
+	// before to open close all files
+	// because open can be called also on reload
+	p.enabled = false
+	p.Close()
+
+	// open files ?
 	if len(p.config.GeoIP.DbCountryFile) > 0 {
 		p.dbCountry, err = maxminddb.Open(p.config.GeoIP.DbCountryFile)
 		if err != nil {

diff --git a/transformers/normalize.go b/transformers/normalize.go
@@ -88,14 +88,11 @@ func NewNormalizeSubprocessor(
 		logError:    logError,
 	}
 
-	s.LoadActiveProcessors()
 	return s
 }
 
 func (p *NormalizeProcessor) ReloadConfig(config *dnsutils.ConfigTransformers) {
-	// save the new config
 	p.config = config
-	p.LoadActiveProcessors()
 }
 
 func (p *NormalizeProcessor) LogInfo(msg string, v ...interface{}) {

diff --git a/transformers/subprocessors.go b/transformers/subprocessors.go
@@ -57,26 +57,27 @@ func NewTransforms(config *dnsutils.ConfigTransformers, logger *logger.Logger, n
 
 func (p *Transforms) ReloadConfig(config *dnsutils.ConfigTransformers) {
 	p.config = config
-	p.Prepare()
-
-	// refresh config
 	p.NormalizeTransform.ReloadConfig(config)
+	p.GeoipTransform.ReloadConfig(config)
 
+	p.Prepare()
 }
 
 func (p *Transforms) Prepare() error {
 	// clean the slice
 	p.activeTransforms = p.activeTransforms[:0]
 
 	if p.config.Normalize.Enable {
-		prefixlog := fmt.Sprintf("transformer=normalize#%d - ", p.instance)
-		p.LogInfo(prefixlog + "subprocessor normalize is loaded")
+		prefixlog := fmt.Sprintf("transformer=normalize#%d ", p.instance)
+		p.LogInfo(prefixlog + "loaded")
+
+		p.NormalizeTransform.LoadActiveProcessors()
 	}
 
 	if p.config.GeoIP.Enable {
 		p.activeTransforms = append(p.activeTransforms, p.geoipTransform)
-		prefixlog := fmt.Sprintf("transformer=geoip#%d - ", p.instance)
-		p.LogInfo(prefixlog + "is enabled")
+		prefixlog := fmt.Sprintf("transformer=geoip#%d ", p.instance)
+		p.LogInfo(prefixlog + "loaded")
 
 		if err := p.GeoipTransform.Open(); err != nil {
 			p.LogError(prefixlog+"open error %v", err)