Tweak telemetry config daemon sync

encoredev · May 23, 2024 · 0d64412 · 0d64412
1 parent 6cccd49
commit 0d64412
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 42 deletions.
diff --git a/cli/cmd/encore/cmdutil/daemon.go b/cli/cmd/encore/cmdutil/daemon.go
@@ -20,27 +20,27 @@ import (
 	daemonpb "encr.dev/proto/encore/daemon"
 )
 
-// DaemonOption is an option for connecting to the Encore daemon.
-type DaemonOption func(*daemonOptions)
+func IsDaemonRunning(ctx context.Context) bool {
+	socketPath, err := daemonSockPath()
+	if err != nil {
+		return false
+	}
+	if _, err := xos.SocketStat(socketPath); err == nil {
+		// The socket exists; check that it is responsive.
+		if cc, err := dialDaemon(ctx, socketPath); err == nil {
+			_ = cc.Close()
+			return true
+		}
+		// socket is not responding, remove it
+		_ = os.Remove(socketPath)
+	}
+	return false
 
-type daemonOptions struct {
-	skipStart bool
 }
 
-var (
-	// SkipStart skips starting the daemon if it is not already running.
-	SkipStart DaemonOption = func(o *daemonOptions) {
-		o.skipStart = true
-	}
-)
-
 // ConnectDaemon returns a client connection to the Encore daemon.
 // By default, it will start the daemon if it is not already running.
-func ConnectDaemon(ctx context.Context, opts ...DaemonOption) daemonpb.DaemonClient {
-	var options daemonOptions
-	for _, o := range opts {
-		o(&options)
-	}
+func ConnectDaemon(ctx context.Context) daemonpb.DaemonClient {
 	socketPath, err := daemonSockPath()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "fatal: ", err)
@@ -76,9 +76,6 @@ func ConnectDaemon(ctx context.Context, opts ...DaemonOption) daemonpb.DaemonCli
 		_ = os.Remove(socketPath)
 	}
 
-	if options.skipStart {
-		return nil
-	}
 	// Start the daemon.
 	if err := StartDaemonInBackground(ctx); err != nil {
 		Fatal("starting daemon: ", err)

diff --git a/cli/cmd/encore/telemetry.go b/cli/cmd/encore/telemetry.go
@@ -44,24 +44,20 @@ func printTelemetryStatus() {
 }
 
 func updateTelemetry(ctx context.Context) {
-	err := func() error {
-		//
-		daemon := cmdutil.ConnectDaemon(ctx, cmdutil.SkipStart)
-		if daemon != nil {
-			// Update the telemetry config on the daemon if it is running
-			_, err := daemon.Telemetry(ctx, &daemonpb.TelemetryConfig{
-				AnonId:  telemetry.GetAnonID(),
-				Enabled: telemetry.IsEnabled(),
-				Debug:   telemetry.IsDebug(),
-			})
-			return err
-		} else {
-			// Update the telemetry config locally if the daemon is not running
-			return telemetry.SaveConfig()
+	// Update the telemetry config on the daemon if it is running
+	if cmdutil.IsDaemonRunning(ctx) {
+		daemon := cmdutil.ConnectDaemon(ctx)
+		_, err := daemon.Telemetry(ctx, &daemonpb.TelemetryConfig{
+			AnonId:  telemetry.GetAnonID(),
+			Enabled: telemetry.IsEnabled(),
+			Debug:   telemetry.IsDebug(),
+		})
+		if err != nil {
+			log.Debug().Err(err).Msgf("could not update daemon telemetry: %s", err)
 		}
-	}()
-	if err != nil {
-		log.Debug().Err(err).Msgf("could not update telemetry: %s", err)
+	}
+	if err := telemetry.SaveConfig(); err != nil {
+		log.Debug().Err(err).Msgf("could not save telemetry: %s", err)
 	}
 }
 

diff --git a/cli/daemon/telemetry.go b/cli/daemon/telemetry.go
@@ -10,11 +10,6 @@ import (
 )
 
 func (s *Server) Telemetry(ctx context.Context, req *daemonpb.TelemetryConfig) (*emptypb.Empty, error) {
-	if telemetry.UpdateConfig(req.AnonId, req.Enabled, req.Debug) {
-		err := telemetry.SaveConfig()
-		if err != nil {
-			return nil, err
-		}
-	}
+	telemetry.UpdateConfig(req.AnonId, req.Enabled, req.Debug)
 	return new(emptypb.Empty), nil
 }