wiresocks: pass logger to ipscanner

Signed-off-by: Mark Pashmfouroush <[email protected]>

app/app.go

@@ -60,7 +60,7 @@ func RunWarp(ctx context.Context, l *slog.Logger, opts WarpOptions) error {
 	endpoints := []string{opts.Endpoint, opts.Endpoint}
 
 	if opts.Scan != nil {
-		res, err := wiresocks.RunScan(ctx, *opts.Scan)
+		res, err := wiresocks.RunScan(ctx, l, *opts.Scan)
 		if err != nil {
 			return err
 		}

ipscanner/internal/engine/engine.go

@@ -28,7 +28,7 @@ func NewScannerEngine(opts *statute.ScannerOptions) *Engine {
 		ipQueue:   queue,
 		ping:      p.DoPing,
 		generator: iterator.NewIterator(opts),
-		log:       opts.Logger.With(slog.String("subsystem", "engine")),
+		log:       opts.Logger.With(slog.String("subsystem", "scanner/engine")),
 	}
 }
 

wiresocks/scanner.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"time"
 
 	"github.com/bepass-org/warp-plus/ipscanner"
@@ -17,7 +18,7 @@ type ScanOptions struct {
 	MaxRTT time.Duration
 }
 
-func RunScan(ctx context.Context, opts ScanOptions) (result []ipscanner.IPInfo, err error) {
+func RunScan(ctx context.Context, l *slog.Logger, opts ScanOptions) (result []ipscanner.IPInfo, err error) {
 	cfg, err := ini.Load("./primary/wgcf-profile.ini")
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file: %w", err)
@@ -31,6 +32,7 @@ func RunScan(ctx context.Context, opts ScanOptions) (result []ipscanner.IPInfo,
 
 	// new scanner
 	scanner := ipscanner.NewScanner(
+		ipscanner.WithLogger(l.With(slog.String("subsystem", "scanner"))),
 		ipscanner.WithWarpPing(),
 		ipscanner.WithWarpPrivateKey(privateKey),
 		ipscanner.WithWarpPeerPublicKey(publicKey),