lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcd: Pull in default URLs from upstream

Browse Source 
This depends on https://github.com/coreos/etcd/pull/6837
This commit is contained in:
James Shubin
2018-04-13 05:02:58 -04:00
parent 4d8faeb826
commit acdb497b80
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
etcd/etcd.go
View File

@@ -87,8 +87,10 @@ const (
selfRemoveTimeout = 3 // give unnominated members a chance to self exit selfRemoveTimeout = 3 // give unnominated members a chance to self exit
exitDelay = 3 // number of sec of inactivity after exit to clean up exitDelay = 3 // number of sec of inactivity after exit to clean up
DefaultIdealClusterSize = 5 // default ideal cluster size target for initial seed DefaultIdealClusterSize = 5 // default ideal cluster size target for initial seed
DefaultClientURL = "127.0.0.1:2379"
DefaultServerURL = "127.0.0.1:2380" DefaultClientURL = embed.DefaultListenClientURLs // 127.0.0.1:2379
DefaultServerURL = embed.DefaultListenPeerURLs // 127.0.0.1:2380
// DefaultMaxTxnOps is the maximum number of operations to run in a // DefaultMaxTxnOps is the maximum number of operations to run in a
// single etcd transaction. If you exceed this limit, it is possible // single etcd transaction. If you exceed this limit, it is possible
// that you have either an extremely large code base, or that you have // that you have either an extremely large code base, or that you have
@@ -262,8 +264,11 @@ func NewEmbdEtcd(hostname string, seeds, clientURLs, serverURLs, advertiseClient
// TODO: add some sort of auto assign method for picking these defaults // TODO: add some sort of auto assign method for picking these defaults
// add a default so that our local client can connect locally if needed // add a default so that our local client can connect locally if needed
if len(obj.LocalhostClientURLs()) == 0 { // if we don't have any localhost URLs if len(obj.LocalhostClientURLs()) == 0 { // if we don't have any localhost URLs
u := url.URL{Scheme: "http", Host: DefaultClientURL} // default u, err := url.Parse(DefaultClientURL)
obj.clientURLs = append([]url.URL{u}, obj.clientURLs...) // prepend if err != nil {
return nil // TODO: change interface to return an error
}
obj.clientURLs = append([]url.URL{*u}, obj.clientURLs...) // prepend
} }
// add a default for local use and testing, harmless and useful! // add a default for local use and testing, harmless and useful!
@@ -271,8 +276,11 @@ func NewEmbdEtcd(hostname string, seeds, clientURLs, serverURLs, advertiseClient
if len(obj.endpoints) > 0 { if len(obj.endpoints) > 0 {
obj.noServer = true // we didn't have enough to be a server obj.noServer = true // we didn't have enough to be a server
} }
u := url.URL{Scheme: "http", Host: DefaultServerURL} // default u, err := url.Parse(DefaultServerURL) // default
obj.serverURLs = []url.URL{u} if err != nil {
return nil // TODO: change interface to return an error
}
obj.serverURLs = []url.URL{*u}
} }
return obj return obj