Logging and other fixes. This one fixes #12 among other changes.

Author: user00265

cmd/dxcluster-client/main.go

@@ -102,8 +102,7 @@ func RunApplication(ctx context.Context, args []string) int {
 		}
 	}
 
-	logging.Notice("Starting %s v%s (+%s)", version.ProjectName, version.ProjectVersion, version.ProjectGitHubURL)
-	logging.Notice("User-Agent: %s", version.UserAgent)
+	logging.Notice("Starting %s %s (+%s)", version.ProjectName, version.ProjectVersion, version.ProjectGitHubURL)
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -281,7 +280,7 @@ func RunApplication(ctx context.Context, args []string) int {
 	// CRITICAL BARRIER: DXCC and LoTW data are now FULLY LOADED and ready.
 	// ═══════════════════════════════════════════════════════════════════════════
 	// Spots can now be enriched immediately upon arrival from any source.
-	logging.Info("DXCC and LoTW data loaded. Ready to initialize spot sources and HTTP API.")
+	logging.Notice("DXCC and LoTW data loaded. Ready to initialize spot sources and HTTP API.")
 
 	// --- 6. Initialize POTA Client (if enabled) ---
 	var potaClient *pota.Client

internal/dxcc/client.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -247,11 +248,24 @@ func (c *Client) Close() {
 
 // createTables creates the DXCC tables if they don't exist.
 func (c *Client) createTables() error {
-	// First, drop existing tables to ensure new schema
-	dropQueries := []string{
-		fmt.Sprintf("DROP TABLE IF EXISTS %s", prefixesTableName),
-		fmt.Sprintf("DROP TABLE IF EXISTS %s", exceptionsTableName),
-		fmt.Sprintf("DROP TABLE IF EXISTS %s", entitiesTableName),
+	// Only drop tables if DXCC_FORCE_REBUILD environment variable is set
+	// This prevents data loss on every restart while allowing schema updates when needed
+	forceRebuild := os.Getenv("DXCC_FORCE_REBUILD") == "true" || os.Getenv("DXCC_FORCE_REBUILD") == "1"
+
+	if forceRebuild {
+		logging.Warn("DXCC_FORCE_REBUILD is set - dropping existing tables to rebuild schema")
+		dropQueries := []string{
+			fmt.Sprintf("DROP TABLE IF EXISTS %s", prefixesTableName),
+			fmt.Sprintf("DROP TABLE IF EXISTS %s", exceptionsTableName),
+			fmt.Sprintf("DROP TABLE IF EXISTS %s", entitiesTableName),
+		}
+
+		db := c.dbClient.GetDB()
+		for _, query := range dropQueries {
+			if _, err := db.Exec(query); err != nil {
+				return fmt.Errorf("failed to drop table: %w\nQuery: %s", err, query)
+			}
+		}
 	}
 
 	queries := []string{
@@ -311,13 +325,6 @@ func (c *Client) createTables() error {
 
 	db := c.dbClient.GetDB()
 
-	// Drop existing tables first
-	for _, query := range dropQueries {
-		if _, err := db.Exec(query); err != nil {
-			return fmt.Errorf("failed to drop table: %w\nQuery: %s", err, query)
-		}
-	}
-
 	// Create new tables with updated schema
 	for _, query := range queries {
 		if _, err := db.Exec(query); err != nil {
@@ -522,9 +529,9 @@ func (c *Client) loadMapsFromDB(ctx context.Context) error {
 	exceptionCount := len(c.exceptionsMap)
 	entityCount := len(c.entitiesMap)
 
-	// Only log at INFO level if we actually have data, otherwise use DEBUG
+	// Only log at NOTICE level if we actually have data, otherwise use DEBUG
 	if prefixCount > 0 || exceptionCount > 0 || entityCount > 0 {
-		logging.Info("DXCC data loaded: %d prefixes, %d exceptions, %d entities.", prefixCount, exceptionCount, entityCount)
+		logging.Notice("DXCC data loaded: %d prefixes, %d exceptions, %d entities.", prefixCount, exceptionCount, entityCount)
 	} else {
 		logging.Debug("DXCC data loaded: %d prefixes, %d exceptions, %d entities (empty - will check for updates).", prefixCount, exceptionCount, entityCount)
 	}
@@ -537,30 +544,14 @@ func (c *Client) loadMapsFromDB(ctx context.Context) error {
 }
 
 // StartUpdater starts the periodic update job for DXCC data.
+// Note: Does NOT perform an initial check - main.go handles that synchronously before calling this.
 func (c *Client) StartUpdater(ctx context.Context) {
 	if c.updateStop != nil {
 		return // already running
 	}
 	c.updateStop = make(chan struct{})
 	c.updateDone = make(chan struct{})
 
-	// Check if initial update is needed
-	go func() {
-		needsUpdate, err := c.needsUpdate(ctx)
-		if err != nil {
-			logging.Error("Failed to check if DXCC data needs update: %v", err)
-			// Fallback to update on error
-			needsUpdate = true
-		}
-
-		if needsUpdate {
-			logging.Info("DXCC data needs update, fetching...")
-			c.fetchAndStoreData(ctx)
-		} else {
-			logging.Info("DXCC data is up to date, skipping initial download")
-		}
-	}()
-
 	go func() {
 		ticker := time.NewTicker(c.cfg.DXCCUpdateInterval)
 		defer ticker.Stop()
@@ -577,7 +568,7 @@ func (c *Client) StartUpdater(ctx context.Context) {
 			}
 		}
 	}()
-	logging.Info("DXCC updater started. Will check for updates every %s.", c.cfg.DXCCUpdateInterval)
+	logging.Notice("DXCC updater started. Will check for updates every %s.", c.cfg.DXCCUpdateInterval)
 }
 
 // fetchAndStoreData downloads the cty.xml.gz, parses it, and replaces data in the database.
@@ -652,7 +643,7 @@ func (c *Client) fetchAndStoreData(ctx context.Context) {
 			logging.Error("Both Club Log and GitHub DXCC downloads failed after retries: %v", err)
 			return
 		}
-		logging.Info("Successfully downloaded DXCC data from GitHub fallback.")
+		logging.Notice("Successfully downloaded DXCC data from GitHub fallback.")
 		// Debug: show a small diagnostic about the fetched payload to help tests
 		gz := false
 		if len(data) >= 2 && data[0] == 0x1f && data[1] == 0x8b {
@@ -668,7 +659,7 @@ func (c *Client) fetchAndStoreData(ctx context.Context) {
 		}
 		logging.Debug("DXCC fallback download diagnostics: bytes=%d gzipped=%t head=%q", len(data), gz, head)
 	} else {
-		logging.Info("Successfully downloaded DXCC data from Club Log.")
+		logging.Notice("Successfully downloaded DXCC data from Club Log.")
 	}
 
 	xmlData, err := c.decompressAndParseXML(data)

internal/lotw/client.go

@@ -213,7 +213,7 @@ func (c *Client) StartUpdater(ctx context.Context) {
 			logging.Info("LoTW data needs update, fetching...")
 			c.fetchAndStoreUsers(ctx)
 		} else {
-			logging.Info("LoTW data is up to date, skipping initial download")
+			logging.Notice("LoTW data is up to date, skipping initial download")
 		}
 	}()
 

internal/pota/client.go

@@ -268,7 +268,7 @@ func NewClient(ctx context.Context, cfg config.Config, rdb *redisclient.Client)
 	// Choose caching mechanism
 	if cfg.Redis.Enabled && rdb != nil {
 		client.cacher = NewRedisSpotCacher(rdb, cfg.Redis.SpotExpiry)
-		logging.Info("POTA client using Redis cache with expiry: %s", cfg.Redis.SpotExpiry)
+		logging.Notice("POTA client using Redis cache with expiry: %s", cfg.Redis.SpotExpiry)
 	} else {
 		client.cacher = NewInMemorySpotCacher(cfg.MaxCache) // Use MaxCache as a proxy for in-memory size
 		logging.Info("POTA client using in-memory cache (max %d spots).", cfg.MaxCache)
@@ -312,7 +312,7 @@ func (c *Client) StartPolling(ctx context.Context) {
 			}
 		}
 	}()
-	logging.Info("POTA polling started. Initial poll will run shortly, then every %s.", c.cfg.POTAPollInterval)
+	logging.Notice("POTA polling started. Initial poll will run shortly, then every %s.", c.cfg.POTAPollInterval)
 }
 
 // StopPolling halts the continuous polling.
@@ -332,7 +332,6 @@ func (c *Client) StopPolling() {
 
 // fetchAndProcessSpots fetches, parses, and caches POTA spots.
 func (c *Client) fetchAndProcessSpots(ctx context.Context) {
-	logging.Info("Fetching POTA spots from %s", config.POTAAPIEndpoint)
 	req, err := http.NewRequestWithContext(ctx, "GET", config.POTAAPIEndpoint, nil)
 	if err != nil {
 		logging.Error("Failed to create HTTP request for POTA API: %v", err)
@@ -363,7 +362,7 @@ func (c *Client) fetchAndProcessSpots(ctx context.Context) {
 		logging.Error("Failed to unmarshal POTA API response: %v", err)
 		return
 	}
-	logging.Debug("Received %d raw POTA spots.", len(rawSpots))
+	logging.Notice("Fetching POTA spots from %s: received %d spots", config.POTAAPIEndpoint, len(rawSpots))
 
 	for _, item := range rawSpots {
 		// Parse frequency from string to float64