diff --git a/logic/peers.go b/logic/peers.go index 00a8fbdb..1519a9b4 100644 --- a/logic/peers.go +++ b/logic/peers.go @@ -193,6 +193,7 @@ func GetPeersForProxy(node *models.Node, onlyPeers bool) (proxy_models.ProxyMana return proxyPayload, nil } +// GetProxyUpdateForHost - gets the proxy update for host func GetProxyUpdateForHost(host *models.Host) (proxy_models.ProxyManagerPayload, error) { proxyPayload := proxy_models.ProxyManagerPayload{ Action: proxy_models.ProxyUpdate, diff --git a/logic/relay.go b/logic/relay.go index a3cd5028..740c8939 100644 --- a/logic/relay.go +++ b/logic/relay.go @@ -207,6 +207,7 @@ func DeleteRelay(network, nodeid string) ([]models.Node, models.Node, error) { return returnnodes, node, nil } +// DeleteHostRelay - removes host as relay func DeleteHostRelay(relayHostID string) (relayHost *models.Host, relayedHosts []models.Host, err error) { relayHost, err = GetHost(relayHostID) if err != nil { diff --git a/mq/publishers.go b/mq/publishers.go index bd7250ab..c0589c54 100644 --- a/mq/publishers.go +++ b/mq/publishers.go @@ -34,20 +34,6 @@ func PublishPeerUpdate() error { return err } -func PublishProxyPeerUpdate(host *models.Host) error { - proxyUpdate, err := logic.GetProxyUpdateForHost(host) - if err != nil { - return err - } - proxyUpdate.Action = proxy_models.ProxyUpdate - err = ProxyUpdate(&proxyUpdate, host) - if err != nil { - logger.Log(1, "failed to send proxy update: ", err.Error()) - return err - } - return nil -} - // PublishSingleHostUpdate --- determines and publishes a peer update to one host func PublishSingleHostUpdate(host *models.Host) error { @@ -106,26 +92,6 @@ func NodeUpdate(node *models.Node) error { return nil } -// ProxyUpdate -- publishes updates to peers related to proxy -func ProxyUpdate(proxyPayload *proxy_models.ProxyManagerPayload, host *models.Host) error { - - if !servercfg.IsMessageQueueBackend() || !host.ProxyEnabled { - return nil - } - logger.Log(3, "publishing proxy update to "+host.ID.String()) - - data, err := json.Marshal(proxyPayload) - if err != nil { - logger.Log(2, "error marshalling node update ", err.Error()) - return err - } - if err = publish(host, fmt.Sprintf("proxy/%s/%s", host.ID, servercfg.GetServer()), data); err != nil { - logger.Log(2, "error publishing proxy update to peer ", host.ID.String(), err.Error()) - return err - } - return nil -} - // sendPeers - retrieve networks, send peer ports to all peers func sendPeers() {