nit(refactor): remove the unnecessary for loop

longhorn-9438 Signed-off-by: Phan Le <phan.le@suse.com> (cherry picked from commit 00a5464) # Conflicts: # pkg/disk/disk.go # pkg/instance/instance.go # pkg/proxy/proxy.go
longhorn · Sep 13, 2024 · c48f596 · c48f596
1 parent a6dddfa
commit c48f596
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -85,7 +85,11 @@ func NewServer(ctx context.Context, spdkEnabled bool, spdkServiceAddress string)
 
 func (s *Server) startMonitoring() {
 	<-s.ctx.Done()
+<<<<<<< HEAD
 	logrus.Infof("%s: stopped monitoring replicas due to the context done", types.DiskGrpcService)
+=======
+	logrus.Infof("%s: stopped monitoring due to the context done", types.DiskGrpcService)
+>>>>>>> 00a5464f (nit(refactor): remove the unnecessary for loop)
 }
 
 func (s *Server) VersionGet(ctx context.Context, req *emptypb.Empty) (*rpc.DiskVersionResponse, error) {

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
@@ -78,7 +78,11 @@ func NewServer(ctx context.Context, logsDir, processManagerServiceAddress, spdkS
 
 func (s *Server) startMonitoring() {
 	<-s.ctx.Done()
+<<<<<<< HEAD
 	logrus.Infof("%s: stopped monitoring replicas due to the context done", types.InstanceGrpcService)
+=======
+	logrus.Infof("%s: stopped monitoring due to the context done", types.InstanceGrpcService)
+>>>>>>> 00a5464f (nit(refactor): remove the unnecessary for loop)
 }
 
 func (s *Server) VersionGet(ctx context.Context, req *emptypb.Empty) (*rpc.VersionResponse, error) {

diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -80,7 +80,11 @@ func NewProxy(ctx context.Context, logsDir, diskServiceAddress, spdkServiceAddre
 
 func (p *Proxy) startMonitoring() {
 	<-p.ctx.Done()
+<<<<<<< HEAD
 	logrus.Infof("%s: stopped monitoring replicas due to the context done", types.ProxyGRPCService)
+=======
+	logrus.Infof("%s: stopped monitoring due to the context done", types.ProxyGRPCService)
+>>>>>>> 00a5464f (nit(refactor): remove the unnecessary for loop)
 }
 
 func (p *Proxy) ServerVersionGet(ctx context.Context, req *rpc.ProxyEngineRequest) (resp *rpc.EngineVersionProxyResponse, err error) {