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

agent: Omit certains keys from the /self endpoint

This commit is contained in:
Armon Dadgar 2014-05-29 11:24:37 -07:00
parent acc048036b
commit 753cec4cfa
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/agent/config.go
View File

@ -54,7 +54,7 @@ type Config struct {
Domain string `mapstructure:"domain"` Domain string `mapstructure:"domain"`
// Encryption key to use for the Serf communication // Encryption key to use for the Serf communication
EncryptKey string `mapstructure:"encrypt"` EncryptKey string `mapstructure:"encrypt" json:"-"`
// LogLevel is the level of the logs to putout // LogLevel is the level of the logs to putout
LogLevel string `mapstructure:"log_level"` LogLevel string `mapstructure:"log_level"`
@ -144,16 +144,16 @@ type Config struct {
// AEInterval controls the anti-entropy interval. This is how often // AEInterval controls the anti-entropy interval. This is how often
// the agent attempts to reconcile it's local state with the server' // the agent attempts to reconcile it's local state with the server'
// representation of our state. Defaults to every 60s. // representation of our state. Defaults to every 60s.
AEInterval time.Duration `mapstructure:"-"` AEInterval time.Duration `mapstructure:"-" json:"-"`
// Checks holds the provided check definitions // Checks holds the provided check definitions
Checks []*CheckDefinition `mapstructure:"-"` Checks []*CheckDefinition `mapstructure:"-" json:"-"`
// Services holds the provided service definitions // Services holds the provided service definitions
Services []*ServiceDefinition `mapstructure:"-"` Services []*ServiceDefinition `mapstructure:"-" json:"-"`
// ConsulConfig can either be provided or a default one created // ConsulConfig can either be provided or a default one created
ConsulConfig *consul.Config `mapstructure:"-"` ConsulConfig *consul.Config `mapstructure:"-" json:"-"`
} }
type dirEnts []os.FileInfo type dirEnts []os.FileInfo

7
website/source/docs/agent/http.html.markdown
View File

@ -305,7 +305,6 @@ It returns a JSON body like this:
"DataDir": "/tmp/consul", "DataDir": "/tmp/consul",
"DNSRecursor": "", "DNSRecursor": "",
"Domain": "consul.", "Domain": "consul.",
"EncryptKey": "",
"LogLevel": "INFO", "LogLevel": "INFO",
"NodeName": "foobar", "NodeName": "foobar",
"ClientAddr": "127.0.0.1", "ClientAddr": "127.0.0.1",
@ -333,11 +332,7 @@ It returns a JSON body like this:
"UiDir": "", "UiDir": "",
"PidFile": "", "PidFile": "",
"EnableSyslog": false, "EnableSyslog": false,
"RejoinAfterLeave": false, "RejoinAfterLeave": false
"AEInterval": 60000000000,
"Checks": null,
"Services": null,
"ConsulConfig": null
}, },
"Member": { "Member": {
"Name": "foobar", "Name": "foobar",