kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #632 from mavenugo/vin-fixes 

Moved the default local and global store to new root
This commit is contained in:
Jana Radhakrishnan 2015-10-11 23:25:49 -07:00
parent d751a1d35e 74376e8676
commit 053b71fb47
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libnetwork/config/config.go
View File

@ -68,7 +68,7 @@ type Option func(c *Config)
// OptionDefaultNetwork function returns an option setter for a default network // OptionDefaultNetwork function returns an option setter for a default network
func OptionDefaultNetwork(dn string) Option { func OptionDefaultNetwork(dn string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option DefaultNetwork: %s", dn) log.Debugf("Option DefaultNetwork: %s", dn)
c.Daemon.DefaultNetwork = strings.TrimSpace(dn) c.Daemon.DefaultNetwork = strings.TrimSpace(dn)
} }
} }
@ -76,7 +76,7 @@ func OptionDefaultNetwork(dn string) Option {
// OptionDefaultDriver function returns an option setter for default driver // OptionDefaultDriver function returns an option setter for default driver
func OptionDefaultDriver(dd string) Option { func OptionDefaultDriver(dd string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option DefaultDriver: %s", dd) log.Debugf("Option DefaultDriver: %s", dd)
c.Daemon.DefaultDriver = strings.TrimSpace(dd) c.Daemon.DefaultDriver = strings.TrimSpace(dd)
} }
} }
@ -102,7 +102,7 @@ func OptionLabels(labels []string) Option {
// OptionKVProvider function returns an option setter for kvstore provider // OptionKVProvider function returns an option setter for kvstore provider
func OptionKVProvider(provider string) Option { func OptionKVProvider(provider string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option OptionKVProvider: %s", provider) log.Debugf("Option OptionKVProvider: %s", provider)
if _, ok := c.Scopes[datastore.GlobalScope]; !ok { if _, ok := c.Scopes[datastore.GlobalScope]; !ok {
c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{} c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}
} }
@ -113,7 +113,7 @@ func OptionKVProvider(provider string) Option {
// OptionKVProviderURL function returns an option setter for kvstore url // OptionKVProviderURL function returns an option setter for kvstore url
func OptionKVProviderURL(url string) Option { func OptionKVProviderURL(url string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option OptionKVProviderURL: %s", url) log.Debugf("Option OptionKVProviderURL: %s", url)
if _, ok := c.Scopes[datastore.GlobalScope]; !ok { if _, ok := c.Scopes[datastore.GlobalScope]; !ok {
c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{} c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}
} }
@ -196,7 +196,7 @@ func IsValidName(name string) bool {
// OptionLocalKVProvider function returns an option setter for kvstore provider // OptionLocalKVProvider function returns an option setter for kvstore provider
func OptionLocalKVProvider(provider string) Option { func OptionLocalKVProvider(provider string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option OptionLocalKVProvider: %s", provider) log.Debugf("Option OptionLocalKVProvider: %s", provider)
if _, ok := c.Scopes[datastore.LocalScope]; !ok { if _, ok := c.Scopes[datastore.LocalScope]; !ok {
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{} c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
} }
@ -207,7 +207,7 @@ func OptionLocalKVProvider(provider string) Option {
// OptionLocalKVProviderURL function returns an option setter for kvstore url // OptionLocalKVProviderURL function returns an option setter for kvstore url
func OptionLocalKVProviderURL(url string) Option { func OptionLocalKVProviderURL(url string) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option OptionLocalKVProviderURL: %s", url) log.Debugf("Option OptionLocalKVProviderURL: %s", url)
if _, ok := c.Scopes[datastore.LocalScope]; !ok { if _, ok := c.Scopes[datastore.LocalScope]; !ok {
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{} c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
} }
@ -218,7 +218,7 @@ func OptionLocalKVProviderURL(url string) Option {
// OptionLocalKVProviderConfig function returns an option setter for kvstore config // OptionLocalKVProviderConfig function returns an option setter for kvstore config
func OptionLocalKVProviderConfig(config *store.Config) Option { func OptionLocalKVProviderConfig(config *store.Config) Option {
return func(c *Config) { return func(c *Config) {
log.Infof("Option OptionLocalKVProviderConfig: %v", config) log.Debugf("Option OptionLocalKVProviderConfig: %v", config)
if _, ok := c.Scopes[datastore.LocalScope]; !ok { if _, ok := c.Scopes[datastore.LocalScope]; !ok {
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{} c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
} }

8
libnetwork/datastore/datastore.go
View File

@ -126,7 +126,7 @@ func makeDefaultScopes() map[string]*ScopeCfg {
def[LocalScope] = &ScopeCfg{ def[LocalScope] = &ScopeCfg{
Client: ScopeClientCfg{ Client: ScopeClientCfg{
Provider: "boltdb", Provider: "boltdb",
Address: defaultPrefix + "/boltdb.db", Address: defaultPrefix + "/local-kv.db",
Config: &store.Config{ Config: &store.Config{
Bucket: "libnetwork", Bucket: "libnetwork",
}, },
@ -136,7 +136,7 @@ func makeDefaultScopes() map[string]*ScopeCfg {
return def return def
} }
var rootChain = []string{"docker", "libnetwork"} var rootChain = []string{"docker", "network", "v1.0"}
func init() { func init() {
consul.Register() consul.Register()
@ -148,11 +148,11 @@ func init() {
// DefaultScopes returns a map of default scopes and it's config for clients to use. // DefaultScopes returns a map of default scopes and it's config for clients to use.
func DefaultScopes(dataDir string) map[string]*ScopeCfg { func DefaultScopes(dataDir string) map[string]*ScopeCfg {
if dataDir != "" { if dataDir != "" {
defaultScopes[LocalScope].Client.Address = dataDir + "/network/files/boltdb.db" defaultScopes[LocalScope].Client.Address = dataDir + "/network/files/local-kv.db"
return defaultScopes return defaultScopes
} }
defaultScopes[LocalScope].Client.Address = defaultPrefix + "/boltdb.db" defaultScopes[LocalScope].Client.Address = defaultPrefix + "/local-kv.db"
return defaultScopes return defaultScopes
} }

4
libnetwork/datastore/datastore_test.go
View File

@ -20,13 +20,13 @@ func NewTestDataStore() DataStore {
func TestKey(t *testing.T) { func TestKey(t *testing.T) {
eKey := []string{"hello", "world"} eKey := []string{"hello", "world"}
sKey := Key(eKey...) sKey := Key(eKey...)
if sKey != "docker/libnetwork/hello/world/" { if sKey != "docker/network/v1.0/hello/world/" {
t.Fatalf("unexpected key : %s", sKey) t.Fatalf("unexpected key : %s", sKey)
} }
} }
func TestParseKey(t *testing.T) { func TestParseKey(t *testing.T) {
keySlice, err := ParseKey("/docker/libnetwork/hello/world/") keySlice, err := ParseKey("/docker/network/v1.0/hello/world/")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }