Merge branch 'netclient_refactor_latest' of https://github.com/gravitl/netmaker into netclient_refactor_peer_updates

This commit is contained in:
Abhishek Kondur 2023-01-04 10:29:29 +05:30
commit de6361e7e5
2 changed files with 5 additions and 1 deletions

View file

@ -130,6 +130,10 @@ func deleteHost(w http.ResponseWriter, r *http.Request) {
return
}
if err = mq.DeleteMqClient(currHost.ID.String()); err != nil {
logger.Log(0, "error removing DynSec credentials for host:", currHost.Name, err.Error())
}
apiHostData := currHost.ConvertNMHostToAPI()
logger.Log(2, r.Header.Get("user"), "removed host", currHost.Name)
w.WriteHeader(http.StatusOK)

View file

@ -113,7 +113,7 @@ func (a *ApiNode) ConvertToServerNode(currentNode *Node) *Node {
func (nm *Node) ConvertToAPINode() *ApiNode {
apiNode := ApiNode{}
apiNode.ID = nm.ID.String()
apiNode.HostID = nm.ID.String()
apiNode.HostID = nm.HostID.String()
apiNode.Address = nm.Address.String()
if isEmptyAddr(apiNode.Address) {
apiNode.Address = ""