Add hostname as tag

ui/amqp.go

@@ -6,14 +6,11 @@ import (
 	json "encoding/json"
 	"fmt"
 	amqp "github.com/rabbitmq/amqp091-go"
-	"os"
 	"time"
 )
 
 const exchange = "yabl-newproto-in"
 
-var hostname, _ = os.Hostname()
-
 type broker struct {
 	uri  string
 	conn *amqp.Connection
@@ -33,9 +30,9 @@ func (b *broker) Consume(event *yabl.Event) {
 
 	route := fmt.Sprintf(
 		"%s.%s.%s.%d",
-		hostname,
-		event.ActionName,
-		event.Field,
+		*event.Tag,
+		*event.ActionName,
+		*event.Field,
 		event.GetUnitId())
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)

ui/amqp_test.go

@@ -17,10 +17,14 @@ func TestNewAmqp(t *testing.T) {
 		client.Start()
 
 		now := time.Now()
+		field := yabl.FBoardReady
+		action := yabl.PPuErrors
+		tag := "localhost"
 
 		event := &yabl.Event{
-			Field:      yabl.FBoardReady,
-			ActionName: yabl.PPuErrors,
+			Tag:        &tag,
+			Field:      &field,
+			ActionName: &action,
 			Object:     nil,
 			//unit:       3,
 			Updated: &now,

ui/table.go

@@ -21,7 +21,7 @@ type key struct {
 }
 
 func (t *table) update(event *yabl.Event) {
-	if cell, ok := t.views[key{event.ActionName, event.Field, event.GetUnitId()}]; ok {
+	if cell, ok := t.views[key{*event.ActionName, *event.Field, event.GetUnitId()}]; ok {
 		cell.SetText(fmt.Sprintf("%v", event.Value))
 	}
 }

ui/ui.go

@@ -67,48 +67,6 @@ func (g *gui) Consume(event *yabl.Event) {
 	g.convertersErrors.update(event)
 	g.cpu.update(event)
 
-	switch event.Object.(type) {
-	case *yabl.PuPresentEnergy:
-		break
-	case *yabl.PuPeriphery:
-		break
-	case *yabl.PuDebug:
-		break
-	case *yabl.PuErrors:
-		break
-	case *yabl.ContactorInternalErrors:
-		break
-	case *yabl.ContactorInternalDebug:
-		break
-	case *yabl.ContactorInternalState:
-		break
-	case *yabl.ContactorsInternalForce:
-		break
-	case *yabl.PeripheryState:
-		break
-	case *yabl.PeripheryInfo:
-		break
-	case *yabl.PeripheryDebug:
-		break
-	case *yabl.ConverterPresentEnergy:
-		break
-	case *yabl.ConverterErrors:
-		break
-	case *yabl.ConverterDebug:
-		break
-	case *yabl.CpuPresentEnergy:
-		break
-	case *yabl.CpuEnergySettings:
-		break
-	case *yabl.CpuErrors:
-		break
-	case *yabl.CpuPeriphery:
-		break
-	case *yabl.CpuDebug:
-		break
-	default:
-		return
-	}
 	g.redraw = true
 }
 
@@ -241,8 +199,8 @@ func (l log) Consume(event *yabl.Event) {
 	fmt.Printf(
 		"%v %v.%v [%d] %v\n",
 		event.Updated.Format("Jan _2 15:04:05.000"),
-		event.ActionName,
-		event.Field,
+		*event.ActionName,
+		*event.Field,
 		event.GetUnitId(),
 		event.Value)
 }