Rename 'status' to 'cluster_load' event stream

Signed-off-by: Yevhen Vydolob <[email protected]>
crc-org · Oct 10, 2023 · 03e30bb · 03e30bb
1 parent 2875a74
commit 03e30bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/cmd/crc/cmd/status.go b/cmd/crc/cmd/status.go
@@ -81,7 +81,7 @@ func runWatchStatus(writer io.Writer, client *daemonclient.Client, cacheDir stri
 
 	isPullInit := false
 
-	err := client.SSEClient.Status(func(loadResult *types.ClusterLoadResult) {
+	err := client.SSEClient.ClusterLoad(func(loadResult *types.ClusterLoadResult) {
 		if !isPullInit {
 			ramBar, cpuBars = createBars(loadResult.CPUUse, writer)
 			barPull = pb.NewPool(append([]*pb.ProgressBar{ramBar}, cpuBars...)...)

diff --git a/pkg/crc/api/client/sse_client.go b/pkg/crc/api/client/sse_client.go
@@ -21,8 +21,8 @@ func NewSSEClient(transport *http.Transport) *SSEClient {
 	}
 }
 
-func (c *SSEClient) Status(statusCallback func(*types.ClusterLoadResult)) error {
-	err := c.client.Subscribe("status", func(msg *sse.Event) {
+func (c *SSEClient) ClusterLoad(statusCallback func(*types.ClusterLoadResult)) error {
+	err := c.client.Subscribe("cluster_load", func(msg *sse.Event) {
 		wmState := &types.ClusterLoadResult{}
 		err := json.Unmarshal(msg.Data, wmState)
 		if err != nil {

diff --git a/pkg/crc/api/events/status.go → pkg/crc/api/events/cluster_load_stream.go b/pkg/crc/api/events/status.go → pkg/crc/api/events/cluster_load_stream.go
@@ -19,18 +19,18 @@ type TickListener struct {
 	tickPeriod time.Duration
 }
 
-func newStatusStream(server *EventServer) EventStream {
-	return newStream(NewStatusListener(server.machine), newEventPublisher(STATUS, server.sseServer))
+func newClusterLoadStream(server *EventServer) EventStream {
+	return newStream(newStatusListener(server.machine), newEventPublisher(CLUSTER_LOAD, server.sseServer))
 }
 
-func NewStatusListener(machine crcMachine.Client) EventProducer {
+func newStatusListener(machine crcMachine.Client) EventProducer {
 	getStatus := func() (interface{}, error) {
 		return machine.GetClusterLoad()
 	}
-	return NewTickListener(getStatus)
+	return newTickListener(getStatus)
 }
 
-func NewTickListener(generator genData) EventProducer {
+func newTickListener(generator genData) EventProducer {
 	return &TickListener{
 		done:       make(chan bool),
 		generator:  generator,

diff --git a/pkg/crc/api/events/event_server.go b/pkg/crc/api/events/event_server.go
@@ -55,7 +55,7 @@ func NewEventServer(machine machine.Client) *EventServer {
 	}
 
 	sseServer.CreateStream(LOGS)
-	sseServer.CreateStream(STATUS)
+	sseServer.CreateStream(CLUSTER_LOAD)
 	return eventServer
 }
 
@@ -67,8 +67,8 @@ func createEventStream(server *EventServer, streamID string) EventStream {
 	switch streamID {
 	case LOGS:
 		return newLogsStream(server)
-	case STATUS:
-		return newStatusStream(server)
+	case CLUSTER_LOAD:
+		return newClusterLoadStream(server)
 	}
 	return nil
 }
diff --git a/pkg/crc/api/events/events.go b/pkg/crc/api/events/events.go
@@ -3,8 +3,8 @@ package events
 import "github.com/r3labs/sse/v2"
 
 const (
-	LOGS   = "logs"   // Logs event channel, contains daemon logs
-	STATUS = "status" // status event channel, contains VM load info
+	LOGS         = "logs"         // Logs event channel, contains daemon logs
+	CLUSTER_LOAD = "cluster_load" // status event channel, contains VM load info
 )
 
 type EventPublisher interface {