Update cli/daemon/daemon.go

cmaglie · silvanocerza · web-flow · commit 386756a48d53 · 2021-09-13T13:25:07.000+02:00
Co-authored-by: Silvano Cerza &lt;3314350+silvanocerza@users.noreply.github.com&gt;
diff --git a/cli/daemon/daemon.go b/cli/daemon/daemon.go
@@ -73,15 +73,14 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
 		defer stats.Flush()
 	}
 	port := configuration.Settings.GetString("daemon.port")
-	var s *grpc.Server
+	gRPCOptions := []grpc.ServerOption{}
 	if debug {
-		s = grpc.NewServer(
+		gRPCOptions = append(gRPCOptions,
 			grpc.UnaryInterceptor(unaryLoggerInterceptor),
 			grpc.StreamInterceptor(streamLoggerInterceptor),
 		)
-	} else {
-		s = grpc.NewServer()
 	}
+	s := grpc.NewServer(gRPCOptions...)
 	// Set specific user-agent for the daemon
 	configuration.Settings.Set("network.user_agent_ext", "daemon")
 

Original file line number	Diff line number	Diff line change
`@@ -73,15 +73,14 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {`
`73`	`73`	`defer stats.Flush()`
`74`	`74`	`}`
`75`	`75`	`port := configuration.Settings.GetString("daemon.port")`
`76`		`- var s *grpc.Server`
	`76`	`+ gRPCOptions := []grpc.ServerOption{}`
`77`	`77`	`if debug {`
`78`		`- s = grpc.NewServer(`
	`78`	`+ gRPCOptions = append(gRPCOptions,`
`79`	`79`	`grpc.UnaryInterceptor(unaryLoggerInterceptor),`
`80`	`80`	`grpc.StreamInterceptor(streamLoggerInterceptor),`
`81`	`81`	`)`
`82`		`- } else {`
`83`		`- s = grpc.NewServer()`
`84`	`82`	`}`
	`83`	`+ s := grpc.NewServer(gRPCOptions...)`
`85`	`84`	`// Set specific user-agent for the daemon`
`86`	`85`	`configuration.Settings.Set("network.user_agent_ext", "daemon")`
`87`	`86`