Merge pull request #1626 from safchain/fix-subscrib-proto

objectstore: specify protobuf as client protocol

Author: nplanel

analyzer/flow_subscriber_endpoint.go

@@ -34,7 +34,7 @@ type FlowSubscriberEndpoint struct {
 
 // SendFlows sends flow to the subscribers
 func (fs *FlowSubscriberEndpoint) SendFlows(flowArray *flow.FlowArray) {
-	msg := ws.NewStructMessage("flow", "store", flowArray)
+	msg := ws.NewStructMessage("flow", "store", flowArray.Flows)
 	fs.pool.BroadcastMessage(msg)
 }
 

contrib/objectstore/subscriber/objectstore.go

@@ -39,12 +39,13 @@ type Subscriber struct {
 func (s *Subscriber) OnStructMessage(c ws.Speaker, msg *ws.StructMessage) {
 	switch msg.Type {
 	case "store":
-		var flowArray flow.FlowArray
-		if err := flowArray.Unmarshal(msg.Obj); err != nil {
+		var flows []*flow.Flow
+		if err := json.Unmarshal(msg.Obj, &flows); err != nil {
 			logging.GetLogger().Error("Failed to unmarshal flows: ", err)
 			return
 		}
-		s.StoreFlows(flowArray.Flows)
+
+		s.StoreFlows(flows)
 
 	default:
 		logging.GetLogger().Error("Unknown message type: ", msg.Type)