Merge pull request #13 from tomvil/print_received_neighbors_log_with_debug_only

Add logger and move Received neighbor update to debug

Author: NerijusRazvodovskis

cmd/neigh2route/main.go

@@ -2,36 +2,39 @@ package main
 
 import (
 	"flag"
-	"log"
 	"os"
 	"os/signal"
 	"syscall"
 
+	"github.com/tomvil/neigh2route/internal/logger"
 	"github.com/tomvil/neigh2route/internal/neighbor"
 )
 
 var (
 	listenInterface = flag.String("interface", "", "Interface to monitor for neighbor updates")
+	debugMode       = flag.Bool("debug", false, "Enable debug logging")
 )
 
 func main() {
 	flag.Parse()
 
+	logger.Init(*debugMode)
+
 	nm, err := neighbor.NewNeighborManager(*listenInterface)
 	if err != nil {
-		log.Fatalf("Failed to initialize neighbor manager: %v", err)
+		logger.Error("Failed to initialize neighbor manager: %v", err)
 	}
 
 	if err := nm.InitializeNeighborTable(); err != nil {
-		log.Fatalf("Failed to initialize neighbor table: %v", err)
+		logger.Error("Failed to initialize neighbor table: %v", err)
 	}
 
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 
 	go func() {
 		sig := <-c
-		log.Printf("Received signal: %s. Cleaning up and exiting...", sig)
+		logger.Info("Received signal: %s. Cleaning up and exiting...", sig)
 		nm.Cleanup()
 		os.Exit(0)
 	}()

internal/logger/logger.go

@@ -0,0 +1,29 @@
+package logger
+
+import (
+	"log"
+)
+
+var debugEnabled bool = false
+
+func Init(debug bool) {
+	debugEnabled = debug
+}
+
+func Debug(format string, v ...interface{}) {
+	if debugEnabled {
+		log.Printf("[DEBUG] "+format, v...)
+	}
+}
+
+func Info(format string, v ...interface{}) {
+	log.Printf("[INFO] "+format, v...)
+}
+
+func Warn(format string, v ...interface{}) {
+	log.Printf("[WARN] "+format, v...)
+}
+
+func Error(format string, v ...interface{}) {
+	log.Printf("[ERROR] "+format, v...)
+}

internal/neighbor/manager.go

@@ -1,11 +1,11 @@
 package neighbor
 
 import (
-	"log"
 	"net"
 	"sync"
 	"time"
 
+	"github.com/tomvil/neigh2route/internal/logger"
 	"github.com/tomvil/neigh2route/pkg/netutils"
 	"github.com/vishvananda/netlink"
 )
@@ -47,7 +47,7 @@ func (nm *NeighborManager) AddNeighbor(ip net.IP, linkIndex int) {
 			return
 		}
 
-		log.Printf("Neighbor %s link index changed, re-adding neighbor", ip.String())
+		logger.Info("Neighbor %s link index changed, re-adding neighbor", ip.String())
 		shouldRemoveNeighbor = true
 	}
 
@@ -62,11 +62,11 @@ func (nm *NeighborManager) AddNeighbor(ip net.IP, linkIndex int) {
 	}
 
 	if err := netutils.AddRoute(ip, linkIndex); err != nil {
-		log.Printf("Failed to add route for neighbor %s: %v", ip.String(), err)
+		logger.Info("Failed to add route for neighbor %s: %v", ip.String(), err)
 		return
 	}
 
-	log.Printf("Added neighbor %s", ip.String())
+	logger.Info("Added neighbor %s", ip.String())
 }
 
 func (nm *NeighborManager) RemoveNeighbor(ip net.IP, linkIndex int) {
@@ -76,7 +76,7 @@ func (nm *NeighborManager) RemoveNeighbor(ip net.IP, linkIndex int) {
 	for i, n := range nm.reachableNeighbors {
 		if n.ip.Equal(ip) && n.linkIndex == linkIndex {
 			nm.reachableNeighbors = append(nm.reachableNeighbors[:i], nm.reachableNeighbors[i+1:]...)
-			log.Printf("Removed neighbor %s", ip.String())
+			logger.Info("Removed neighbor %s", ip.String())
 			shouldRemoveRoute = true
 			break
 		}
@@ -85,7 +85,7 @@ func (nm *NeighborManager) RemoveNeighbor(ip net.IP, linkIndex int) {
 
 	if shouldRemoveRoute {
 		if err := netutils.RemoveRoute(ip, linkIndex); err != nil {
-			log.Printf("Failed to remove route for neighbor %s: %v", ip.String(), err)
+			logger.Info("Failed to remove route for neighbor %s: %v", ip.String(), err)
 			return
 		}
 	}
@@ -115,21 +115,21 @@ func (nm *NeighborManager) InitializeNeighborTable() error {
 		return err
 	}
 
-	log.Printf("Initializing neighbor table with %d neighbors", len(neighbors))
+	logger.Info("Initializing neighbor table with %d neighbors", len(neighbors))
 
 	for _, n := range neighbors {
 		if n.IP.IsLinkLocalUnicast() {
-			log.Printf("Skipping link-local neighbor with IP=%s, LinkIndex=%d", n.IP, n.LinkIndex)
+			logger.Info("Skipping link-local neighbor with IP=%s, LinkIndex=%d", n.IP, n.LinkIndex)
 			continue
 		}
 
 		if (n.State&(netlink.NUD_REACHABLE|netlink.NUD_STALE)) != 0 && !nm.isNeighborExternallyLearned(n.Flags) {
-			log.Printf("Adding neighbor with IP=%s, LinkIndex=%d", n.IP, n.LinkIndex)
+			logger.Info("Adding neighbor with IP=%s, LinkIndex=%d", n.IP, n.LinkIndex)
 			nm.AddNeighbor(n.IP, n.LinkIndex)
 		}
 	}
 
-	log.Printf("Neighbor table initialized finished")
+	logger.Info("Neighbor table initialized finished")
 
 	return nil
 }
@@ -140,7 +140,7 @@ func (nm *NeighborManager) MonitorNeighbors() {
 	defer close(done)
 
 	if err := netlink.NeighSubscribe(updates, done); err != nil {
-		log.Fatalf("Failed to subscribe to neighbor updates: %v (interface: %s, index: %d)",
+		logger.Error("Failed to subscribe to neighbor updates: %v (interface: %s, index: %d)",
 			err, nm.targetInterface, nm.targetInterfaceIndex)
 	}
 
@@ -153,7 +153,7 @@ func (nm *NeighborManager) MonitorNeighbors() {
 			continue
 		}
 
-		log.Printf("Received neighbor update: IP=%s, State=%s, Flags=%s, LinkIndex=%d",
+		logger.Debug("Received neighbor update: IP=%s, State=%s, Flags=%s, LinkIndex=%d",
 			update.Neigh.IP, neighborStateToString(update.Neigh.State), neighborFlagsToString(update.Neigh.Flags), update.Neigh.LinkIndex)
 
 		if (update.Neigh.State&(netlink.NUD_REACHABLE|netlink.NUD_STALE)) != 0 && !nm.isNeighborExternallyLearned(update.Neigh.Flags) {
@@ -180,7 +180,7 @@ func (nm *NeighborManager) SendPings() {
 			go func(n Neighbor) {
 				defer wg.Done()
 				if err := netutils.Ping(n.ip.String()); err != nil {
-					log.Printf("Failed to ping neighbor %s: %v", n.ip.String(), err)
+					logger.Info("Failed to ping neighbor %s: %v", n.ip.String(), err)
 				}
 			}(n)
 		}
@@ -196,9 +196,9 @@ func (nm *NeighborManager) Cleanup() {
 
 	for _, n := range nm.reachableNeighbors {
 		if err := netutils.RemoveRoute(n.ip, n.linkIndex); err != nil {
-			log.Printf("Failed to remove route for neighbor %s: %v", n.ip.String(), err)
+			logger.Info("Failed to remove route for neighbor %s: %v", n.ip.String(), err)
 			continue
 		}
-		log.Printf("Removed route for neighbor %s", n.ip.String())
+		logger.Info("Removed route for neighbor %s", n.ip.String())
 	}
 }

pkg/netutils/ping.go

@@ -1,16 +1,17 @@
 package netutils
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/go-ping/ping"
+	"github.com/tomvil/neigh2route/internal/logger"
 )
 
 func Ping(ip string) error {
 	pinger, err := ping.NewPinger(ip)
 	if err != nil {
-		return fmt.Errorf("failed to create pinger: %w", err)
+		logger.Error("failed to create pinger: %w", err)
+		return err
 	}
 
 	pinger.Count = 3
@@ -20,7 +21,8 @@ func Ping(ip string) error {
 
 	err = pinger.Run()
 	if err != nil {
-		return fmt.Errorf("failed to run pinger: %w", err)
+		logger.Error("failed to run pinger: %w", err)
+		return err
 	}
 
 	return nil

pkg/netutils/route.go

@@ -1,10 +1,9 @@
 package netutils
 
 import (
-	"fmt"
-	"log"
 	"net"
 
+	"github.com/tomvil/neigh2route/internal/logger"
 	"github.com/vishvananda/netlink"
 )
 
@@ -14,15 +13,16 @@ func routeExists(dst *net.IPNet, linkIndex int) (bool, error) {
 		Dst:       dst,
 	}, netlink.RT_FILTER_DST|netlink.RT_FILTER_OIF)
 	if err != nil {
-		return false, fmt.Errorf("failed to list routes for dst %s on link %d: %w", dst.String(), linkIndex, err)
+		logger.Error("Failed to list routes for dst %s on link %d: %w", dst.String(), linkIndex, err)
+		return false, err
 	}
 
 	if len(routes) == 0 {
-		log.Printf("No routes found for dst %s on link index %d", dst.String(), linkIndex)
+		logger.Info("No routes found for dst %s on link index %d", dst.String(), linkIndex)
 		return false, nil
 	}
 
-	log.Printf("Found %d routes for dst %s on link index %d", len(routes), dst.String(), linkIndex)
+	logger.Info("Found %d routes for dst %s on link index %d", len(routes), dst.String(), linkIndex)
 	return true, nil
 }
 
@@ -36,7 +36,8 @@ func AddRoute(ip net.IP, linkIndex int) error {
 
 	exists, err := routeExists(routeDst, linkIndex)
 	if err != nil {
-		return fmt.Errorf("failed to check if route exists for %s: %w", ip.String(), err)
+		logger.Error("Failed to check if route exists for %s: %w", ip.String(), err)
+		return err
 	}
 
 	if exists {
@@ -50,10 +51,11 @@ func AddRoute(ip net.IP, linkIndex int) error {
 	}
 
 	if err := netlink.RouteAdd(route); err != nil {
-		return fmt.Errorf("failed to add route for %s: %w", ip.String(), err)
+		logger.Error("Failed to add route for %s: %w", ip.String(), err)
+		return err
 	}
 
-	log.Printf("Added route for %s on link index %d", ip.String(), linkIndex)
+	logger.Info("Added route for %s on link index %d", ip.String(), linkIndex)
 	return nil
 }
 
@@ -67,7 +69,8 @@ func RemoveRoute(ip net.IP, linkIndex int) error {
 
 	exists, err := routeExists(routeDst, linkIndex)
 	if err != nil {
-		return fmt.Errorf("failed to check if route exists for %s: %w", ip.String(), err)
+		logger.Error("Failed to check if route exists for %s: %w", ip.String(), err)
+		return err
 	}
 
 	if !exists {
@@ -81,9 +84,10 @@ func RemoveRoute(ip net.IP, linkIndex int) error {
 	}
 
 	if err := netlink.RouteDel(route); err != nil {
-		return fmt.Errorf("failed to remove route for %s: %w", ip.String(), err)
+		logger.Error("Failed to remove route for %s: %w", ip.String(), err)
+		return err
 	}
 
-	log.Printf("Removed route for %s on link index %d", ip.String(), linkIndex)
+	logger.Info("Removed route for %s on link index %d", ip.String(), linkIndex)
 	return nil
 }