From 83bfe0d223eb65ae7d0e7781773dfaa42d071302 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Mon, 23 Oct 2017 10:08:31 +0200 Subject: [PATCH] Revert "config: document config options" This reverts commit a38c69d7844a4e4a9d54051470977c7446fc8e57. --- agent/config/runtime.go | 109 ++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 70 deletions(-) diff --git a/agent/config/runtime.go b/agent/config/runtime.go index b0dd61bda..6230f173d 100644 --- a/agent/config/runtime.go +++ b/agent/config/runtime.go @@ -453,40 +453,21 @@ type RuntimeConfig struct { Datacenter string NodeName string - AdvertiseAddrLAN *net.IPAddr - AdvertiseAddrWAN *net.IPAddr - BindAddr *net.IPAddr - - // Bootstrap is used to bring up the first Consul server, and - // permits that node to elect itself leader - // - // hcl: bootstrap = (true|false) - // flag: -bootstrap - Bootstrap bool - - // BootstrapExpect tries to automatically bootstrap the Consul cluster, - // by withholding peers until enough servers join. - // - // hcl: bootstrap_expect = int - // flag: -bootstrap-expect=int - BootstrapExpect int - - CAFile string - CAPath string - CertFile string - CheckUpdateInterval time.Duration - Checks []*structs.CheckDefinition - ClientAddrs []*net.IPAddr - DNSAddrs []net.Addr - DNSPort int - DataDir string - - // DevMode enables a fast-path mode of operation to bring up an in-memory - // server with minimal configuration. Useful for developing Consul. - // - // flag: -dev - DevMode bool - + AdvertiseAddrLAN *net.IPAddr + AdvertiseAddrWAN *net.IPAddr + BindAddr *net.IPAddr + Bootstrap bool + BootstrapExpect int + CAFile string + CAPath string + CertFile string + CheckUpdateInterval time.Duration + Checks []*structs.CheckDefinition + ClientAddrs []*net.IPAddr + DNSAddrs []net.Addr + DNSPort int + DataDir string + DevMode bool DisableAnonymousSignature bool DisableCoordinates bool DisableHostNodeID bool @@ -504,43 +485,31 @@ type RuntimeConfig struct { // todo(fs): rename to ACLEnableReplication EnableACLReplication bool - EnableDebug bool - EnableScriptChecks bool - EnableSyslog bool - EnableUI bool - EncryptKey string - EncryptVerifyIncoming bool - EncryptVerifyOutgoing bool - HTTPAddrs []net.Addr - HTTPPort int - HTTPSAddrs []net.Addr - HTTPSPort int - KeyFile string - LeaveDrainTime time.Duration - LeaveOnTerm bool - LogLevel string - NodeID types.NodeID - NodeMeta map[string]string - NonVotingServer bool - PidFile string - RPCAdvertiseAddr *net.TCPAddr - RPCBindAddr *net.TCPAddr - RPCHoldTimeout time.Duration - - // RPCRateLimit and RPCMaxBurst control how frequently RPC calls are allowed - // to happen. In any large enough time interval, rate limiter limits the - // rate to RPCRate tokens per second, with a maximum burst size of - // RPCMaxBurst events. As a special case, if RPCRate == Inf (the infinite - // rate), RPCMaxBurst is ignored. - // - // See https://en.wikipedia.org/wiki/Token_bucket for more about token - // buckets. - // - // hcl: limit { rpc_rate = (float64|MaxFloat64) rpc_max_burst = int } - RPCRateLimit rate.Limit - RPCMaxBurst int - + EnableDebug bool + EnableScriptChecks bool + EnableSyslog bool + EnableUI bool + EncryptKey string + EncryptVerifyIncoming bool + EncryptVerifyOutgoing bool + HTTPAddrs []net.Addr + HTTPPort int + HTTPSAddrs []net.Addr + HTTPSPort int + KeyFile string + LeaveDrainTime time.Duration + LeaveOnTerm bool + LogLevel string + NodeID types.NodeID + NodeMeta map[string]string + NonVotingServer bool + PidFile string + RPCAdvertiseAddr *net.TCPAddr + RPCBindAddr *net.TCPAddr + RPCHoldTimeout time.Duration + RPCMaxBurst int RPCProtocol int + RPCRateLimit rate.Limit RaftProtocol int ReconnectTimeoutLAN time.Duration ReconnectTimeoutWAN time.Duration