From b49aed2de003b13c285845d741d5dc52b9a18371 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 11 May 2019 12:45:17 -0700 Subject: [PATCH] updated to use the sample generated events Signed-off-by: Jeff Carr --- channel.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/channel.go b/channel.go index bb333fc..13651ab 100644 --- a/channel.go +++ b/channel.go @@ -8,7 +8,7 @@ import "io" import "bytes" import "github.com/golang/protobuf/proto" -import pb "git.wit.com/jcarr/witProtobuf" +import pb "git.wit.com/wit/witProtobuf" var mychannel chan *pb.Event @@ -20,16 +20,16 @@ func initChannel() { func processEvents() { for { message := <-mychannel - log.Println("processEvents() on channel recieved a message") + log.Println("processEvents() on channel recieved a message = ", message) ReadReceivedData(message) } } func ReadReceivedData(data *pb.Event) { msgItems := data.GetResults() - fmt.Println("Receiving data...") + log.Println("ReadReceivedData() Event msgItems=", msgItems) for _, item := range msgItems { - fmt.Println(item) + log.Println(item) } } @@ -42,7 +42,7 @@ func handleProtoClient(conn net.Conn) { fmt.Fprintf(os.Stderr, "Fatal error: %s", err.Error()) return } - pdata := new(pb.Event) + pdata := pb.CreateSampleEvent() err = proto.Unmarshal(buf.Bytes(), pdata) if err != nil { fmt.Fprintf(os.Stderr, "Fatal error: %s", err.Error()) @@ -52,8 +52,8 @@ func handleProtoClient(conn net.Conn) { } func addEvent() { - msg := new(pb.Event) - msg.Name = "hello jeff" + msg := pb.CreateSampleEvent() + msg.Name = "generated in addEvent()" // var mybuf bytes.Buffer @@ -69,17 +69,10 @@ func addEvent() { // writeBytesToSocket(data) } -func createProtobufEvent() *pb.Event { - msg := new(pb.Event) - msg.Name = "hello jeff" - - return msg -} - func sendEventToWIT() { - msg := createProtobufEvent() - var mybuf []byte + msg := pb.CreateSampleEvent() + var mybuf []byte mybuf, err := proto.Marshal(msg) if (err != nil) { log.Printf("something fucked up happened")