Maybe err and eventlogwriter are both nil?

kolide · Apr 29, 2024 · 6fe7147 · 6fe7147
1 parent d392019
commit 6fe7147
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/log/eventlog/writer_windows.go b/pkg/log/eventlog/writer_windows.go
@@ -49,10 +49,6 @@ type Writer struct {
 }
 
 func (w *Writer) Close() error {
-	// TODO RM why does only CI hit this issue
-	if w == nil {
-		return nil
-	}
 	return windows.DeregisterEventSource(w.handle)
 }
 

diff --git a/pkg/log/multislogger/syslogger_windows.go b/pkg/log/multislogger/syslogger_windows.go
@@ -18,15 +18,15 @@ func SystemSlogger() (*MultiSlogger, io.Closer, error) {
 	if !windows.GetCurrentProcessToken().IsElevated() {
 		syslogger := defaultSystemSlogger()
 
-		syslogger.Log(context.TODO(), slog.LevelDebug,
+		syslogger.Log(context.TODO(), slog.LevelInfo,
 			"launcher running on windows without elevated permissions, using default stderr instead of eventlog",
 		)
 
 		return syslogger, io.NopCloser(nil), nil
 	}
 
 	eventLogWriter, err := eventlog.NewWriter(serviceName)
-	if err != nil {
+	if err != nil || eventLogWriter == nil {
 		syslogger := defaultSystemSlogger()
 
 		syslogger.Log(context.TODO(), slog.LevelError,