kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1707 from AkihiroSuda/improve-error

Browse source 
improve error for getStore()
This commit is contained in:
Alessandro Boch 2017-04-04 23:10:24 -07:00 • committed by GitHub
commit 7ee02a3176
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/error.go
View file

@ -183,3 +183,11 @@ func (mr ManagerRedirectError) Error() string {
// Maskable denotes the type of this error // Maskable denotes the type of this error
func (mr ManagerRedirectError) Maskable() {} func (mr ManagerRedirectError) Maskable() {}
// ErrDataStoreNotInitialized is returned if an invalid data scope is passed
// for getting data store
type ErrDataStoreNotInitialized string
func (dsni ErrDataStoreNotInitialized) Error() string {
return fmt.Sprintf("datastore for scope %q is not initialized", string(dsni))
}

4
libnetwork/store.go
View file

@ -225,7 +225,7 @@ func (n *network) getEndpointsFromStore() ([]*endpoint, error) {
func (c *controller) updateToStore(kvObject datastore.KVObject) error { func (c *controller) updateToStore(kvObject datastore.KVObject) error {
cs := c.getStore(kvObject.DataScope()) cs := c.getStore(kvObject.DataScope())
if cs == nil { if cs == nil {
return fmt.Errorf("datastore for scope %q is not initialized ", kvObject.DataScope()) return ErrDataStoreNotInitialized(kvObject.DataScope())
} }
if err := cs.PutObjectAtomic(kvObject); err != nil { if err := cs.PutObjectAtomic(kvObject); err != nil {
@ -241,7 +241,7 @@ func (c *controller) updateToStore(kvObject datastore.KVObject) error {
func (c *controller) deleteFromStore(kvObject datastore.KVObject) error { func (c *controller) deleteFromStore(kvObject datastore.KVObject) error {
cs := c.getStore(kvObject.DataScope()) cs := c.getStore(kvObject.DataScope())
if cs == nil { if cs == nil {
return fmt.Errorf("datastore for scope %q is not initialized ", kvObject.DataScope()) return ErrDataStoreNotInitialized(kvObject.DataScope())
} }
retry: retry: