fix: shutdown snpjrpc server on context done

Author: ezdac

rolling-shutter/snapshot/snapshot.go

@@ -91,8 +91,6 @@ func (snp *Snapshot) Start(ctx context.Context, runner service.Runner) error {
 	hub := hubapi.New(snp.Config.SnapshotHubURL)
 	snp.hubapi = hub
 
-	runner.Defer(snp.jrpc.Shutdown)
-
 	snp.setupP2PHandler()
 	return runner.StartService(snp.getServices()...)
 }

rolling-shutter/snapshot/snpjrpc/server.go

@@ -145,7 +145,7 @@ func New(
 	return &jrpc
 }
 
-func (snpjrpc *SnpJRPC) Start(_ context.Context, group service.Runner) error {
+func (snpjrpc *SnpJRPC) Start(ctx context.Context, group service.Runner) error { //nolint:unparam
 	group.Go(func() error {
 		httpServer := snpjrpc.Server.Prepare()
 		log.Info().Str("address", snpjrpc.Server.Host).Msg("Running JSON-RPC server at")
@@ -154,6 +154,11 @@ func (snpjrpc *SnpJRPC) Start(_ context.Context, group service.Runner) error {
 		}
 		return nil
 	})
+	group.Go(func() error {
+		<-ctx.Done()
+		snpjrpc.Shutdown()
+		return ctx.Err()
+	})
 	return nil
 }