Merge pull request #142 from tummychow/setpod-errors

tummychow · tummychow · commit 22d0501295d0 · 2015-03-27T13:50:07.000-07:00
diff --git a/pkg/kp/kv.go b/pkg/kp/kv.go
@@ -51,10 +51,14 @@ func (s *Store) SetPod(key string, manifest pods.Manifest) (time.Duration, error
 	}
 
 	writeMeta, err := s.client.KV().Put(keyPair, nil)
-	if writeMeta == nil {
-		return 0, KVError{Op: "set", Key: key}
+	var retDur time.Duration
+	if writeMeta != nil {
+		retDur = writeMeta.RequestTime
 	}
-	return writeMeta.RequestTime, err
+	if err != nil {
+		err = KVError{Op: "set", Key: key}
+	}
+	return retDur, err
 }
 
 // Pod reads a pod manifest from the key-value store. If the given key does not

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,14 @@ func (s *Store) SetPod(key string, manifest pods.Manifest) (time.Duration, error`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`writeMeta, err := s.client.KV().Put(keyPair, nil)`
`54`		`- if writeMeta == nil {`
`55`		`- return 0, KVError{Op: "set", Key: key}`
	`54`	`+ var retDur time.Duration`
	`55`	`+ if writeMeta != nil {`
	`56`	`+ retDur = writeMeta.RequestTime`
`56`	`57`	`}`
`57`		`- return writeMeta.RequestTime, err`
	`58`	`+ if err != nil {`
	`59`	`+ err = KVError{Op: "set", Key: key}`
	`60`	`+ }`
	`61`	`+ return retDur, err`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`// Pod reads a pod manifest from the key-value store. If the given key does not`