diff --git a/daemons/node/nats.go b/daemons/node/nats.go index 34e0d37..7276701 100644 --- a/daemons/node/nats.go +++ b/daemons/node/nats.go @@ -82,7 +82,6 @@ func ListenNATS(n *Node) { for _, p := range m.PeerIDs { peers, _ := n.GetPeerRecord(context.Background(), p) for _, pp := range peers { - fmt.Println(n.PeerID.String(), pp, string(propalgation.Payload)) n.StreamService.PublishCommon(&resp.Datatype, resp.User, resp.Groups, pp.PeerID, stream.ProtocolConsidersResource, propalgation.Payload) } @@ -104,7 +103,6 @@ func ListenNATS(n *Node) { case tools.PB_PLANNER: m := map[string]interface{}{} if err := json.Unmarshal(propalgation.Payload, &m); err == nil { - fmt.Println("PLAN", m) b := []byte{} if len(m) > 1 { b = propalgation.Payload @@ -160,7 +158,6 @@ func ListenNATS(n *Node) { } else { m := map[string]interface{}{} if err := json.Unmarshal(propalgation.Payload, &m); err == nil { - fmt.Println("SEARCH", dt, fmt.Sprintf("%v", m["type"]), fmt.Sprintf("%v", m["type"])) n.PubSubService.SearchPublishEvent( context.Background(), dt, diff --git a/daemons/node/stream/handler.go b/daemons/node/stream/handler.go index 29a3cf5..c4aee62 100644 --- a/daemons/node/stream/handler.go +++ b/daemons/node/stream/handler.go @@ -45,17 +45,17 @@ func (ps *StreamService) handleEvent(protocol string, evt *common.Event) error { } } if protocol == ProtocolConsidersResource { - if err := ps.pass(evt, tools.PB_CONSIDERS); err != nil { + if err := ps.pass(evt, tools.CONSIDERS_EVENT); err != nil { return err } } if protocol == ProtocolAdmiraltyConfigResource { - if err := ps.pass(evt, tools.PB_ADMIRALTY_CONFIG); err != nil { + if err := ps.pass(evt, tools.ADMIRALTY_CONFIG_EVENT); err != nil { return err } } if protocol == ProtocolMinioConfigResource { - if err := ps.pass(evt, tools.PB_MINIO_CONFIG); err != nil { + if err := ps.pass(evt, tools.MINIO_CONFIG_EVENT); err != nil { return err } } @@ -134,19 +134,13 @@ func (abs *StreamService) retrieveResponse(event *common.Event) error { // return nil } -func (abs *StreamService) pass(event *common.Event, action tools.PubSubAction) error { // - if b, err := json.Marshal(&tools.PropalgationMessage{ - Action: action, - DataType: int(event.DataType), +func (abs *StreamService) pass(event *common.Event, method tools.NATSMethod) error { // + go tools.NewNATSCaller().SetNATSPub(method, tools.NATSResponse{ + FromApp: "oc-discovery", + Datatype: tools.DataType(event.DataType), + Method: int(method), Payload: event.Payload, - }); err == nil { - go tools.NewNATSCaller().SetNATSPub(tools.PROPALGATION_EVENT, tools.NATSResponse{ - FromApp: "oc-discovery", - Datatype: tools.DataType(event.DataType), - Method: int(tools.PROPALGATION_EVENT), - Payload: b, - }) - } + }) return nil }