new reloadConfig function

dmachard · Oct 24, 2023 · e6a49f7 · e6a49f7
1 parent a650c77
commit e6a49f7
Show file tree

Hide file tree

Showing 34 changed files with 318 additions and 5 deletions.
diff --git a/collectors/dnstap.go b/collectors/dnstap.go
@@ -85,6 +85,16 @@ func (c *Dnstap) ReadConfig() {
 	}
 }
 
+func (c *Dnstap) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *Dnstap) LogInfo(msg string, v ...interface{}) {
 	c.logger.Info("["+c.name+"] collector=dnstap - "+msg, v...)
 }

diff --git a/collectors/dnstap_proxifier.go b/collectors/dnstap_proxifier.go
@@ -60,6 +60,16 @@ func (c *DnstapProxifier) ReadConfig() {
 	c.sockPath = c.config.Collectors.DnstapProxifier.SockPath
 }
 
+func (c *DnstapProxifier) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *DnstapProxifier) LogInfo(msg string, v ...interface{}) {
 	c.logger.Info("["+c.name+"] collector=dnstaprelay - "+msg, v...)
 }

diff --git a/collectors/file_ingestor.go b/collectors/file_ingestor.go
@@ -93,6 +93,16 @@ func (c *FileIngestor) ReadConfig() {
 		c.config.Collectors.FileIngestor.WatchMode)
 }
 
+func (c *FileIngestor) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *FileIngestor) LogInfo(msg string, v ...interface{}) {
 	c.logger.Info("["+c.name+"] collector=fileingestor - "+msg, v...)
 }

diff --git a/collectors/file_tail.go b/collectors/file_tail.go
@@ -55,6 +55,16 @@ func (c *Tail) ReadConfig() {
 	//tbc
 }
 
+func (c *Tail) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *Tail) LogInfo(msg string, v ...interface{}) {
 	c.logger.Info("["+c.name+"] collector=tail - "+msg, v...)
 }

diff --git a/collectors/powerdns.go b/collectors/powerdns.go
@@ -74,6 +74,16 @@ func (c *ProtobufPowerDNS) ReadConfig() {
 	}
 }
 
+func (c *ProtobufPowerDNS) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *ProtobufPowerDNS) LogInfo(msg string, v ...interface{}) {
 	c.logger.Info("["+c.name+"] collector=powerdns - "+msg, v...)
 }

diff --git a/collectors/sniffer_afpacket.go b/collectors/sniffer_afpacket.go
@@ -203,6 +203,16 @@ func (c *AfpacketSniffer) ReadConfig() {
 	c.device = c.config.Collectors.AfpacketLiveCapture.Device
 }
 
+func (c *AfpacketSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *AfpacketSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/sniffer_afpacket_darwin.go b/collectors/sniffer_afpacket_darwin.go
@@ -57,6 +57,16 @@ func (c *AfpacketSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *AfpacketSniffer) ReadConfig() {
 }
 
+func (c *AfpacketSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *AfpacketSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/sniffer_afpacket_freebsd.go b/collectors/sniffer_afpacket_freebsd.go
@@ -57,6 +57,16 @@ func (c *AfpacketSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *AfpacketSniffer) ReadConfig() {
 }
 
+func (c *AfpacketSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *AfpacketSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/sniffer_afpacket_windows.go b/collectors/sniffer_afpacket_windows.go
@@ -57,6 +57,16 @@ func (c *AfpacketSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *AfpacketSniffer) ReadConfig() {
 }
 
+func (c *AfpacketSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *AfpacketSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/sniffer_xdp.go b/collectors/sniffer_xdp.go
@@ -90,6 +90,16 @@ func (c *XdpSniffer) ReadConfig() {
 	c.identity = c.config.GetServerIdentity()
 }
 
+func (c *XdpSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *XdpSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/sniffer_xdp_windows.go b/collectors/sniffer_xdp_windows.go
@@ -58,6 +58,16 @@ func (c *XdpSniffer) ReadConfig() {
 	c.identity = c.config.GetServerIdentity()
 }
 
+func (c *XdpSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *XdpSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/tzsp.go b/collectors/tzsp.go
@@ -77,6 +77,16 @@ func (c *TzspSniffer) ReadConfig() {
 	// TODO: Implement
 }
 
+func (c *TzspSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *TzspSniffer) Listen() error {
 	c.logger.Info("running in background...")
 

diff --git a/collectors/tzsp_darwin.go b/collectors/tzsp_darwin.go
@@ -57,6 +57,16 @@ func (c *TzspSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *TzspSniffer) ReadConfig() {
 }
 
+func (c *TzspSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *TzspSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/tzsp_freebsd.go b/collectors/tzsp_freebsd.go
@@ -57,6 +57,16 @@ func (c *TzspSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *TzspSniffer) ReadConfig() {
 }
 
+func (c *TzspSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *TzspSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/collectors/tzsp_windows.go b/collectors/tzsp_windows.go
@@ -57,6 +57,16 @@ func (c *TzspSniffer) Loggers() []chan dnsutils.DnsMessage {
 func (c *TzspSniffer) ReadConfig() {
 }
 
+func (c *TzspSniffer) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (c *TzspSniffer) Channel() chan dnsutils.DnsMessage {
 	return nil
 }

diff --git a/dnscollector.go b/dnscollector.go
@@ -291,7 +291,7 @@ func main() {
 		for {
 			select {
 			case <-sigHUP:
-				logger.Info("main - sig hup - reloading config...")
+				logger.Info("main - SIGHUP received")
 
 				// read config
 				err := dnsutils.ReloadConfig(configPath, config)
@@ -303,18 +303,18 @@ func main() {
 				InitLogger(logger, config)
 
 				for _, output := range config.Multiplexer.Loggers {
-					_ = GetItemConfig("loggers", config, output)
+					newcfg := GetItemConfig("loggers", config, output)
 					if _, ok := mapLoggers[output.Name]; ok {
-						fmt.Println(output.Name)
+						mapLoggers[output.Name].ReloadConfig(newcfg)
 					} else {
 						logger.Info("main - reload config logger=%v doest not exist", output.Name)
 					}
 				}
 
 				for _, input := range config.Multiplexer.Collectors {
-					_ = GetItemConfig("collectors", config, input)
+					newcfg := GetItemConfig("collectors", config, input)
 					if _, ok := mapCollectors[input.Name]; ok {
-						fmt.Println(input.Name)
+						mapCollectors[input.Name].ReloadConfig(newcfg)
 					} else {
 						logger.Info("main - reload config collector=%v doest not exist", input.Name)
 					}

diff --git a/dnsutils/worker.go b/dnsutils/worker.go
@@ -7,4 +7,5 @@ type Worker interface {
 	Run()
 	Channel() chan DnsMessage
 	ReadConfig()
+	ReloadConfig(config *Config)
 }
diff --git a/loggers/dnstapclient.go b/loggers/dnstapclient.go
@@ -66,6 +66,16 @@ func (o *DnstapSender) ReadConfig() {
 	}
 }
 
+func (o *DnstapSender) ReloadConfig(config *dnsutils.Config) {
+	o.LogInfo("reload config...")
+
+	// save the new config
+	o.config = config
+
+	// read again
+	o.ReadConfig()
+}
+
 func (o *DnstapSender) LogInfo(msg string, v ...interface{}) {
 	o.logger.Info("["+o.name+"] logger=dnstap - "+msg, v...)
 }

diff --git a/loggers/elasticsearch.go b/loggers/elasticsearch.go
@@ -62,6 +62,16 @@ func (c *ElasticSearchClient) ReadConfig() {
 	c.bulkUrl = u.String()
 }
 
+func (o *ElasticSearchClient) ReloadConfig(config *dnsutils.Config) {
+	o.LogInfo("reload config...")
+
+	// save the new config
+	o.config = config
+
+	// read again
+	o.ReadConfig()
+}
+
 func (o *ElasticSearchClient) Channel() chan dnsutils.DnsMessage {
 	return o.inputChan
 }

diff --git a/loggers/fakelogger.go b/loggers/fakelogger.go
@@ -25,6 +25,8 @@ func (c *FakeLogger) SetLoggers(loggers []dnsutils.Worker) {}
 
 func (o *FakeLogger) ReadConfig() {}
 
+func (o *FakeLogger) ReloadConfig(config *dnsutils.Config) {}
+
 func (o *FakeLogger) Stop() {}
 
 func (o *FakeLogger) Channel() chan dnsutils.DnsMessage {

diff --git a/loggers/falco.go b/loggers/falco.go
@@ -49,6 +49,16 @@ func (c *FalcoClient) ReadConfig() {
 	c.url = c.config.Loggers.FalcoClient.URL
 }
 
+func (c *FalcoClient) ReloadConfig(config *dnsutils.Config) {
+	c.LogInfo("reload config...")
+
+	// save the new config
+	c.config = config
+
+	// read again
+	c.ReadConfig()
+}
+
 func (f *FalcoClient) Channel() chan dnsutils.DnsMessage {
 	return f.inputChan
 }

diff --git a/loggers/fluentd.go b/loggers/fluentd.go
@@ -59,6 +59,16 @@ func (o *FluentdClient) ReadConfig() {
 	}
 }
 
+func (o *FluentdClient) ReloadConfig(config *dnsutils.Config) {
+	o.LogInfo("reload config...")
+
+	// save the new config
+	o.config = config
+
+	// read again
+	o.ReadConfig()
+}
+
 func (o *FluentdClient) LogInfo(msg string, v ...interface{}) {
 	o.logger.Info("["+o.name+"] logger=fluentd - "+msg, v...)
 }

diff --git a/loggers/influxdb.go b/loggers/influxdb.go
@@ -56,6 +56,16 @@ func (o *InfluxDBClient) ReadConfig() {
 	}
 }
 
+func (o *InfluxDBClient) ReloadConfig(config *dnsutils.Config) {
+	o.LogInfo("reload config...")
+
+	// save the new config
+	o.config = config
+
+	// read again
+	o.ReadConfig()
+}
+
 func (o *InfluxDBClient) LogInfo(msg string, v ...interface{}) {
 	o.logger.Info("["+o.name+"] logger=influxdb - "+msg, v...)
 }