PR feedback and refactor: bring logwriter logic directly into sqliteS…

…tore and unexport storeName, clean up

ee/agent/storage/sqlite/keyvalue_store_sqlite.go

@@ -19,18 +19,18 @@ import (
 	_ "modernc.org/sqlite"
 )
 
-type StoreName int
+type storeName int
 
 const (
-	StartupSettingsStore StoreName = iota
-	WatchdogLogStore     StoreName = 1
+	StartupSettingsStore storeName = iota
+	WatchdogLogStore     storeName = 1
 )
 
 var missingMigrationErrFormat = regexp.MustCompile(`no migration found for version \d+`)
 
 // String translates the exported int constant to the actual name of the
 // supported table in the sqlite database.
-func (s StoreName) String() string {
+func (s storeName) String() string {
 	switch s {
 	case StartupSettingsStore:
 		return "startup_settings"
@@ -62,7 +62,7 @@ type sqliteColumns struct {
 
 // OpenRO opens a connection to the database in the given root directory; it does
 // not perform database creation or migration.
-func OpenRO(ctx context.Context, rootDirectory string, name StoreName) (*sqliteStore, error) {
+func OpenRO(ctx context.Context, rootDirectory string, name storeName) (*sqliteStore, error) {
 	if name.String() == "" {
 		return nil, fmt.Errorf("unsupported table %d", name)
 	}
@@ -82,7 +82,7 @@ func OpenRO(ctx context.Context, rootDirectory string, name StoreName) (*sqliteS
 
 // OpenRW creates a validated database connection to a validated database, performing
 // migrations if necessary.
-func OpenRW(ctx context.Context, rootDirectory string, name StoreName) (*sqliteStore, error) {
+func OpenRW(ctx context.Context, rootDirectory string, name storeName) (*sqliteStore, error) {
 	if name.String() == "" {
 		return nil, fmt.Errorf("unsupported table %d", name)
 	}

ee/agent/storage/sqlite/logstore_sqlite.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"time"
 )
 
 func (s *sqliteStore) AppendValue(timestamp int64, value []byte) error {
@@ -98,3 +99,27 @@ func (s *sqliteStore) ForEach(fn func(rowid, timestamp int64, v []byte) error) e
 
 	return nil
 }
+
+// Write implements the io.Writer interface, allowing sqliteStore to be used as
+// a logging backend via multislogger handler
+func (s *sqliteStore) Write(p []byte) (n int, err error) {
+	if s.readOnly {
+		return 0, errors.New("cannot perform write with RO connection")
+	}
+
+	colInfo := s.getColumns()
+	if s == nil || s.conn == nil || colInfo == nil {
+		return 0, errors.New("store is nil")
+	}
+
+	if !colInfo.isLogstore {
+		return 0, errors.New("this table type is not supported for timestamped logging")
+	}
+
+	timestamp := time.Now().Unix()
+	if err := s.AppendValue(timestamp, p); err != nil {
+		return 0, err
+	}
+
+	return len(p), nil
+}

ee/watchdog/watchdog_service_windows.go

@@ -15,7 +15,6 @@ import (
 	"github.com/kolide/launcher/ee/gowrapper"
 	"github.com/kolide/launcher/pkg/launcher"
 	"github.com/kolide/launcher/pkg/log/multislogger"
-	"github.com/kolide/launcher/pkg/log/sqlitelogger"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
@@ -51,12 +50,14 @@ func RunWatchdogService(systemSlogger *multislogger.MultiSlogger, args []string)
 	// Create a local logger to drop logs into the sqlite DB. These will be collected and published
 	// to debug.json from the primary launcher invocation
 	if opts.RootDirectory != "" {
-		ll, err := sqlitelogger.NewSqliteLogWriter(ctx, opts.RootDirectory, agentsqlite.WatchdogLogStore)
+		logWriter, err := agentsqlite.OpenRW(ctx, opts.RootDirectory, agentsqlite.WatchdogLogStore)
 		if err != nil {
-			return fmt.Errorf("initializing sqlite log writer: %w", err)
+			return fmt.Errorf("opening log db in %s: %w", opts.RootDirectory, err)
 		}
 
-		localSloggerHandler := slog.NewJSONHandler(ll, &slog.HandlerOptions{Level: slog.LevelDebug})
+		defer logWriter.Close()
+
+		localSloggerHandler := slog.NewJSONHandler(logWriter, &slog.HandlerOptions{Level: slog.LevelDebug})
 
 		// add the sqlite handler to both local and systemSloggers
 		localSlogger.AddHandler(localSloggerHandler)