feat: introduce logger into realDynDns main loop
This commit is contained in:
14
main.go
14
main.go
@@ -86,23 +86,27 @@ func main() {
|
|||||||
notificationProvider = notificationProviderConsole.New()
|
notificationProvider = notificationProviderConsole.New()
|
||||||
}
|
}
|
||||||
|
|
||||||
rdd := realDynDns.New(externalIpProvider, dnsProvider, notificationProvider, configClient.Domains)
|
rdd := realDynDns.New(externalIpProvider, dnsProvider, notificationProvider, configClient.Domains, logger.With(slog.String("service", "realDynDns")))
|
||||||
|
|
||||||
switch configClient.Mode {
|
switch configClient.Mode {
|
||||||
case config.ScheduledMode:
|
case config.ScheduledMode:
|
||||||
|
logger.Info("Running in scheduled mode", slog.String("interval", configClient.CheckInterval))
|
||||||
|
|
||||||
schedule, job, err := rdd.RunWithSchedule(configClient.CheckInterval)
|
schedule, job, err := rdd.RunWithSchedule(configClient.CheckInterval)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logger.Error("Failed to create scheduler", slog.String("error", err.Error()))
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("Starting scheduler")
|
logger.Info("Next run:", slog.String("time", job.NextRun().String()))
|
||||||
fmt.Println("Next run:", job.NextRun())
|
|
||||||
schedule.StartBlocking()
|
schedule.StartBlocking()
|
||||||
case config.RunOnceMode:
|
case config.RunOnceMode:
|
||||||
numberOfChanges, err := rdd.RunOnce()
|
logger.Info("Running in run once mode")
|
||||||
|
|
||||||
|
_, err := rdd.RunOnce()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logger.Error("Failed to run once", slog.String("error", err.Error()))
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
fmt.Println("Number of changes:", numberOfChanges)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package realDynDns
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"realdnydns/pkg/config"
|
"realdnydns/pkg/config"
|
||||||
@@ -17,6 +18,7 @@ type ChangeDetector struct {
|
|||||||
dnsProvider dnsProvider.DNSProvider
|
dnsProvider dnsProvider.DNSProvider
|
||||||
notificationProvider notificationProvider.NotificationProvider
|
notificationProvider notificationProvider.NotificationProvider
|
||||||
domains []config.DomainConfig
|
domains []config.DomainConfig
|
||||||
|
logger *slog.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(
|
func New(
|
||||||
@@ -24,12 +26,14 @@ func New(
|
|||||||
dnsProvider dnsProvider.DNSProvider,
|
dnsProvider dnsProvider.DNSProvider,
|
||||||
notificationProvider notificationProvider.NotificationProvider,
|
notificationProvider notificationProvider.NotificationProvider,
|
||||||
domains []config.DomainConfig,
|
domains []config.DomainConfig,
|
||||||
|
logger *slog.Logger,
|
||||||
) ChangeDetector {
|
) ChangeDetector {
|
||||||
return ChangeDetector{
|
return ChangeDetector{
|
||||||
externalIpProvider: externalIpProvider,
|
externalIpProvider: externalIpProvider,
|
||||||
dnsProvider: dnsProvider,
|
dnsProvider: dnsProvider,
|
||||||
notificationProvider: notificationProvider,
|
notificationProvider: notificationProvider,
|
||||||
domains: domains,
|
domains: domains,
|
||||||
|
logger: logger,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,8 +62,11 @@ func (c *ChangeDetector) RunOnce() (int, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *ChangeDetector) detectAndApplyChanges() (int, error) {
|
func (c *ChangeDetector) detectAndApplyChanges() (int, error) {
|
||||||
|
c.logger.Info("Detecting and applying changes")
|
||||||
|
|
||||||
externalIp, err := c.externalIpProvider.GetExternalIp()
|
externalIp, err := c.externalIpProvider.GetExternalIp()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.logger.Error("Failed to retrieve external IP", slog.String("error", err.Error()))
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,28 +74,59 @@ func (c *ChangeDetector) detectAndApplyChanges() (int, error) {
|
|||||||
|
|
||||||
for _, domain := range c.domains {
|
for _, domain := range c.domains {
|
||||||
for _, subdomain := range domain.Subdomains {
|
for _, subdomain := range domain.Subdomains {
|
||||||
|
c.logger.Info("Checking record",
|
||||||
|
slog.String("tld", domain.TLD),
|
||||||
|
slog.String("subdomain", subdomain),
|
||||||
|
)
|
||||||
currentRecord, err := c.dnsProvider.GetRecord(domain.TLD, subdomain)
|
currentRecord, err := c.dnsProvider.GetRecord(domain.TLD, subdomain)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.logger.Error("Failed to retrieve record",
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
slog.String("tld", domain.TLD),
|
||||||
|
slog.String("subdomain", subdomain),
|
||||||
|
)
|
||||||
return numberUpdated, err
|
return numberUpdated, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if currentRecord.IP != externalIp.String() {
|
if currentRecord.IP != externalIp.String() {
|
||||||
|
c.logger.Info("Record has changed",
|
||||||
|
slog.String("tld", domain.TLD),
|
||||||
|
slog.String("subdomain", subdomain),
|
||||||
|
slog.String("current_ip", currentRecord.IP),
|
||||||
|
slog.String("external_ip", externalIp.String()),
|
||||||
|
)
|
||||||
|
|
||||||
err = c.notificationProvider.SendNotification(
|
err = c.notificationProvider.SendNotification(
|
||||||
fmt.Sprintf("Update %s.%s", subdomain, domain.TLD),
|
fmt.Sprintf("Update %s.%s", subdomain, domain.TLD),
|
||||||
fmt.Sprintf("The IP of %s has changed from %s to %s", domain.TLD, currentRecord.IP, externalIp.String()),
|
fmt.Sprintf("The IP of %s has changed from %s to %s", domain.TLD, currentRecord.IP, externalIp.String()),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.logger.Warn("Failed to send notification",
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
)
|
||||||
return numberUpdated, err
|
return numberUpdated, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
c.logger.Info("Updating record",
|
||||||
|
slog.String("tld", domain.TLD),
|
||||||
|
slog.String("subdomain", subdomain),
|
||||||
|
slog.String("current_ip", currentRecord.IP),
|
||||||
|
slog.String("external_ip", externalIp.String()),
|
||||||
|
)
|
||||||
_, err = c.dnsProvider.UpdateRecord(domain.TLD, subdomain, externalIp, currentRecord.TTL, currentRecord.Prio, currentRecord.Disabled)
|
_, err = c.dnsProvider.UpdateRecord(domain.TLD, subdomain, externalIp, currentRecord.TTL, currentRecord.Prio, currentRecord.Disabled)
|
||||||
numberUpdated++
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.logger.Error("Failed to update record",
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
slog.String("tld", domain.TLD),
|
||||||
|
slog.String("subdomain", subdomain),
|
||||||
|
)
|
||||||
return numberUpdated, err
|
return numberUpdated, err
|
||||||
}
|
}
|
||||||
|
numberUpdated++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
c.logger.Info("Run completed", slog.Int("number_of_changes", numberUpdated))
|
||||||
return numberUpdated, nil
|
return numberUpdated, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package realDynDns
|
package realDynDns
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log/slog"
|
||||||
"net"
|
"net"
|
||||||
"realdnydns/model/common"
|
"realdnydns/model/common"
|
||||||
"realdnydns/pkg/config"
|
"realdnydns/pkg/config"
|
||||||
@@ -72,7 +73,9 @@ func testDetectAndApplyChangesWithChanges() func(t *testing.T) {
|
|||||||
"@",
|
"@",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
},
|
||||||
|
slog.Default(),
|
||||||
|
)
|
||||||
|
|
||||||
numberUpdated, err := changeDetector.RunOnce()
|
numberUpdated, err := changeDetector.RunOnce()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -101,7 +104,9 @@ func testDetectAndApplyChangesWithoutChanges() func(t *testing.T) {
|
|||||||
"@",
|
"@",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
},
|
||||||
|
slog.Default(),
|
||||||
|
)
|
||||||
|
|
||||||
numberUpdated, err := changeDetector.RunOnce()
|
numberUpdated, err := changeDetector.RunOnce()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user