core/oc-discovery
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rationalized NATS

Browse Source
This commit is contained in:
mr
2026-03-18 16:45:11 +01:00
parent 83285c2ab5
commit 380de4c80b
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemons/node/nats.go
View File

@@ -82,7 +82,6 @@ func ListenNATS(n *Node) {
for _, p := range m.PeerIDs { for _, p := range m.PeerIDs {
peers, _ := n.GetPeerRecord(context.Background(), p) peers, _ := n.GetPeerRecord(context.Background(), p)
for _, pp := range peers { for _, pp := range peers {
fmt.Println(n.PeerID.String(), pp, string(propalgation.Payload))
n.StreamService.PublishCommon(&resp.Datatype, resp.User, resp.Groups, n.StreamService.PublishCommon(&resp.Datatype, resp.User, resp.Groups,
pp.PeerID, stream.ProtocolConsidersResource, propalgation.Payload) pp.PeerID, stream.ProtocolConsidersResource, propalgation.Payload)
} }
@@ -104,7 +103,6 @@ func ListenNATS(n *Node) {
case tools.PB_PLANNER: case tools.PB_PLANNER:
m := map[string]interface{}{} m := map[string]interface{}{}
if err := json.Unmarshal(propalgation.Payload, &m); err == nil { if err := json.Unmarshal(propalgation.Payload, &m); err == nil {
fmt.Println("PLAN", m)
b := []byte{} b := []byte{}
if len(m) > 1 { if len(m) > 1 {
b = propalgation.Payload b = propalgation.Payload
@@ -160,7 +158,6 @@ func ListenNATS(n *Node) {
} else { } else {
m := map[string]interface{}{} m := map[string]interface{}{}
if err := json.Unmarshal(propalgation.Payload, &m); err == nil { 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( n.PubSubService.SearchPublishEvent(
context.Background(), context.Background(),
dt, dt,

20
daemons/node/stream/handler.go
View File

@@ -45,17 +45,17 @@ func (ps *StreamService) handleEvent(protocol string, evt *common.Event) error {
} }
} }
if protocol == ProtocolConsidersResource { 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 return err
} }
} }
if protocol == ProtocolAdmiraltyConfigResource { 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 return err
} }
} }
if protocol == ProtocolMinioConfigResource { 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 return err
} }
} }
@@ -134,19 +134,13 @@ func (abs *StreamService) retrieveResponse(event *common.Event) error { //
return nil return nil
} }
func (abs *StreamService) pass(event *common.Event, action tools.PubSubAction) error { // func (abs *StreamService) pass(event *common.Event, method tools.NATSMethod) error { //
if b, err := json.Marshal(&tools.PropalgationMessage{ go tools.NewNATSCaller().SetNATSPub(method, tools.NATSResponse{
Action: action,
DataType: int(event.DataType),
Payload: event.Payload,
}); err == nil {
go tools.NewNATSCaller().SetNATSPub(tools.PROPALGATION_EVENT, tools.NATSResponse{
FromApp: "oc-discovery", FromApp: "oc-discovery",
Datatype: tools.DataType(event.DataType), Datatype: tools.DataType(event.DataType),
Method: int(tools.PROPALGATION_EVENT), Method: int(method),
Payload: b, Payload: event.Payload,
}) })
}
return nil return nil
} }