6 files changed, 15 insertions, 11 deletions
diff --git a/internal/authkeys/store.go b/internal/authkeys/store.go
index a8c21c4..bfe2a78 100644
--- a/internal/authkeys/store.go
+++ b/internal/authkeys/store.go
@@ -83,8 +83,8 @@ func (s *Store) CreateKey(ctx context.Context, hostname string) (token string, e
 		return "", fmt.Errorf("empty hostname")
 	}
 	raw := make([]byte, 32)
-	if _, err := rand.Read(raw); err != nil {
-		return "", fmt.Errorf("random token: %w", err)
+	if _, readErr := rand.Read(raw); readErr != nil {
+		return "", fmt.Errorf("random token: %w", readErr)
 	}
 	tok := base64.RawURLEncoding.EncodeToString(raw)
 	sum := sha256.Sum256([]byte(tok))
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 81ebc40..3c686db 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -20,7 +20,7 @@ import (
 func Execute(args []string) error {
 	// Handle version flag early.
 	if len(args) > 0 && (args[0] == "-version" || args[0] == "--version") {
-		fmt.Println(version.Version)
+		fmt.Println(version.Tag)
 		return nil
 	}
 	if len(args) >= 1 && (args[0] == "--create-client-key" || args[0] == "-create-client-key") {
diff --git a/internal/cli/cli_test.go b/internal/cli/cli_test.go
index a89fa50..9f3fd6d 100644
--- a/internal/cli/cli_test.go
+++ b/internal/cli/cli_test.go
@@ -62,8 +62,8 @@ func TestStableVersionFlags(t *testing.T) {
 					t.Fatalf("Execute: %v", err)
 				}
 			})
-			if !strings.Contains(out, version.Version) {
-				t.Fatalf("stdout %q should contain version %q", out, version.Version)
+			if !strings.Contains(out, version.Tag) {
+				t.Fatalf("stdout %q should contain version %q", out, version.Tag)
 			}
 		})
 	}
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
index cad2812..876fc81 100644
--- a/internal/daemon/daemon.go
+++ b/internal/daemon/daemon.go
@@ -115,15 +115,15 @@ func Run(ctx context.Context, cfg Config) error {
 		return fmt.Errorf("listen address is required")
 	}
 	w := logWriter(cfg)
-	log, textHandler := newDaemonLogger(w)
+	slogLog, textHandler := newDaemonLogger(w)
 	store, err := openAuthStore(ctx, cfg.StatsDir, cfg.AuthDB)
 	if err != nil {
 		return fmt.Errorf("auth db: %w", err)
 	}
 	defer store.Close()
-	srv := newDaemonHTTPServer(cfg.Addr, withAccessLog(log, routes(cfg.StatsDir, cfg.AuthDB, store)),
+	srv := newDaemonHTTPServer(cfg.Addr, withAccessLog(slogLog, routes(cfg.StatsDir, cfg.AuthDB, store)),
 		slog.NewLogLogger(textHandler, slog.LevelError))
-	log.Info("daemon_listen", "addr", cfg.Addr)
+	slogLog.Info("daemon_listen", "addr", cfg.Addr)
 	errCh := make(chan error, 1)
 	go func() { errCh <- srv.ListenAndServe() }()
 	select {
diff --git a/internal/storage/db.go b/internal/storage/db.go
index 45eb71a..03ffd08 100644
--- a/internal/storage/db.go
+++ b/internal/storage/db.go
@@ -98,12 +98,16 @@ func ImportFromFS(ctx context.Context, db *sql.DB, fsys fs.FS) error {
 }
 
 func LoadRecords(ctx context.Context, db *sql.DB) ([]Record, error) {
+	var n int
+	if err := db.QueryRowContext(ctx, "SELECT COUNT(*) FROM record").Scan(&n); err != nil {
+		return nil, fmt.Errorf("count records: %w", err)
+	}
 	rows, err := db.QueryContext(ctx, "SELECT host, uptime_sec, boot_time, os, os_kernel_name, os_kernel_major FROM record ORDER BY host, boot_time")
 	if err != nil {
 		return nil, fmt.Errorf("query: %w", err)
 	}
 	defer rows.Close()
-	var out []Record
+	out := make([]Record, 0, n)
 	for rows.Next() {
 		select {
 		case <-ctx.Done():
diff --git a/internal/version/version.go b/internal/version/version.go
index a5f7f5b..db740bd 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-// Version is the application version.
-const Version = "0.2.4"
+// Tag is the application release version.
+const Tag = "0.2.4"