From c6ea2195ed61909c392c599d2b27b55d585ca7ca Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 20 Aug 2024 16:22:06 +0200 Subject: [PATCH] correct is DC link --- models/peer/peer_cache.go | 1 - models/workflow/workflow_mongo_accessor.go | 6 ++- .../shared/shared_workspace_mongo_accessor.go | 48 ++++++++++++++----- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/models/peer/peer_cache.go b/models/peer/peer_cache.go index 6543beb..69384f9 100644 --- a/models/peer/peer_cache.go +++ b/models/peer/peer_cache.go @@ -51,7 +51,6 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string, url string if !p.checkPeerStatus(peerID) { return nil, err } - fmt.Println("LaunchPeerExecution", method, url, methods[method], body) if method == tools.POST { b, err = caller.CallPost(url, methods[method], body) } diff --git a/models/workflow/workflow_mongo_accessor.go b/models/workflow/workflow_mongo_accessor.go index e6c1657..57a5787 100644 --- a/models/workflow/workflow_mongo_accessor.go +++ b/models/workflow/workflow_mongo_accessor.go @@ -122,7 +122,11 @@ func (wfa *workflowMongoAccessor) book(id string, realData *Workflow, execs []*w if code != 200 { continue } - b, err := paccess.LaunchPeerExecution(p.GetID(), "", p.(*peer.Peer).Url, utils.BOOKING, tools.POST, + url := p.(*peer.Peer).Url + if p.(*peer.Peer).IsMySelf() { + url = "http://" + utils.BOOKING.String() + } + b, err := paccess.LaunchPeerExecution(p.GetID(), "", url, utils.BOOKING, tools.POST, (&workflow_execution.WorkflowExecutions{ WorkflowID: id, ResourceID: dc_id, diff --git a/models/workspace/shared/shared_workspace_mongo_accessor.go b/models/workspace/shared/shared_workspace_mongo_accessor.go index 3560a46..8181f6d 100644 --- a/models/workspace/shared/shared_workspace_mongo_accessor.go +++ b/models/workspace/shared/shared_workspace_mongo_accessor.go @@ -45,9 +45,13 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkspace(shared *SharedWorkspace for _, p := range shared.Peers { pp, code, _ := paccess.GetAccessor(nil).LoadOne(p) if code == 200 { - b, err := paccess.LaunchPeerExecution(p, v, pp.(*peer.Peer).Url, utils.WORKSPACE, tools.DELETE, nil, wfa.Caller) + url := pp.(*peer.Peer).Url + if pp.(*peer.Peer).IsMySelf() { + url = "http://" + utils.WORKSPACE.String() + } + b, err := paccess.LaunchPeerExecution(p, v, url, utils.WORKSPACE, tools.DELETE, nil, wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + pp.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } } @@ -67,9 +71,13 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkspace(shared *SharedWorkspace paccess := (&peer.Peer{}) pp, code, _ := paccess.GetAccessor(nil).LoadOne(p) if code == 200 { - b, err := paccess.LaunchPeerExecution(p, v, pp.(*peer.Peer).Url, utils.WORKSPACE, tools.POST, workspace.Serialize(), wfa.Caller) + url := pp.(*peer.Peer).Url + if pp.(*peer.Peer).IsMySelf() { + url = "http://" + utils.WORKSPACE.String() + } + b, err := paccess.LaunchPeerExecution(p, v, url, utils.WORKSPACE, tools.POST, workspace.Serialize(), wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + pp.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } } @@ -105,9 +113,13 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkflow(shared *SharedWorkspace, if code != 200 { continue } - b, err := paccess.LaunchPeerExecution(p, v, pp.(*peer.Peer).Url, utils.WORKFLOW, tools.DELETE, nil, wfa.Caller) + url := pp.(*peer.Peer).Url + if pp.(*peer.Peer).IsMySelf() { + url = "http://" + utils.WORKFLOW.String() + } + b, err := paccess.LaunchPeerExecution(p, v, url, utils.WORKFLOW, tools.DELETE, nil, wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + pp.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } } @@ -132,9 +144,13 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkflow(shared *SharedWorkspace, } pp, code, _ := paccess.GetAccessor(nil).LoadOne(p) if code == 200 { - b, err := paccess.LaunchPeerExecution(p, shared.UUID, pp.(*peer.Peer).Url, utils.WORKFLOW, tools.POST, workflow.Serialize(), wfa.Caller) + url := pp.(*peer.Peer).Url + if pp.(*peer.Peer).IsMySelf() { + url = "http://" + utils.WORKFLOW.String() + } + b, err := paccess.LaunchPeerExecution(p, shared.UUID, url, utils.WORKFLOW, tools.POST, workflow.Serialize(), wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + pp.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } } @@ -157,9 +173,13 @@ func (wfa *sharedWorkspaceMongoAccessor) deleteToPeer(shared *SharedWorkspace) { if code != 200 { continue } - b, err := paccess.LaunchPeerExecution(p.GetID(), shared.UUID, p.(*peer.Peer).Url, utils.SHARED_WORKSPACE, tools.DELETE, nil, wfa.Caller) + url := p.(*peer.Peer).Url + if p.(*peer.Peer).IsMySelf() { + url = "http://" + utils.SHARED_WORKSPACE.String() + } + b, err := paccess.LaunchPeerExecution(p.GetID(), shared.UUID, url, utils.SHARED_WORKSPACE, tools.DELETE, nil, wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + p.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } } @@ -177,9 +197,13 @@ func (wfa *sharedWorkspaceMongoAccessor) sendToPeer(shared *SharedWorkspace) { if code != 200 { continue } - b, err := paccess.LaunchPeerExecution(p.GetID(), v, p.(*peer.Peer).Url, utils.SHARED_WORKSPACE, tools.POST, shared.Serialize(), wfa.Caller) + url := p.(*peer.Peer).Url + if p.(*peer.Peer).IsMySelf() { + url = "http://" + utils.SHARED_WORKSPACE.String() + } + b, err := paccess.LaunchPeerExecution(p.GetID(), v, url, utils.SHARED_WORKSPACE, tools.POST, shared.Serialize(), wfa.Caller) if err != nil && b == nil { - wfa.Logger.Error().Msg("Could not send to peer " + p.(*peer.Peer).Url + ". Error: " + err.Error()) + wfa.Logger.Error().Msg("Could not send to peer " + url + ". Error: " + err.Error()) } } }