status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adds the NodeID field back to the /v1/agent/self Config block. 

Fixes #3778
This commit is contained in:
James Phillips 2018-01-10 15:17:33 -08:00
parent ebcd1787db
commit 9509aa6c4b
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/agent_endpoint.go
View File

@ -57,12 +57,14 @@ func (s *HTTPServer) AgentSelf(resp http.ResponseWriter, req *http.Request) (int
config := struct { config := struct {
Datacenter string Datacenter string
NodeName string NodeName string
NodeID string
Revision string Revision string
Server bool Server bool
Version string Version string
}{ }{
Datacenter: s.agent.config.Datacenter, Datacenter: s.agent.config.Datacenter,
NodeName: s.agent.config.NodeName, NodeName: s.agent.config.NodeName,
NodeID: string(s.agent.config.NodeID),
Revision: s.agent.config.Revision, Revision: s.agent.config.Revision,
Server: s.agent.config.ServerMode, Server: s.agent.config.ServerMode,
Version: s.agent.config.Version, Version: s.agent.config.Version,

1
website/source/api/agent.html.md
View File

@ -117,6 +117,7 @@ $ curl \
"Config": { "Config": {
"Datacenter": "dc1", "Datacenter": "dc1",
"NodeName": "foobar", "NodeName": "foobar",
"NodeID": "9d754d17-d864-b1d3-e758-f3fe25a9874f",
"Server": true, "Server": true,
"Revision": "deadbeef", "Revision": "deadbeef",
"Version": "1.0.0" "Version": "1.0.0"