minor logging & httpapi fixes. Closes #230. Closes #228. (#235)

serverless · Aug 7, 2017 · 740e76e · 740e76e
1 parent 9ac22e3
commit 740e76e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/functions/functions.go b/functions/functions.go
@@ -114,6 +114,9 @@ func (f *Functions) DeleteFunction(id FunctionID) error {
 	if err != nil {
 		return &ErrorNotFound{id}
 	}
+
+	f.Log.Debug("Function deleted.", zap.String("functionId", string(id)))
+
 	return nil
 }
 

diff --git a/functions/httpapi.go b/functions/httpapi.go
@@ -120,4 +120,6 @@ func (h HTTPAPI) deleteFunction(w http.ResponseWriter, r *http.Request, params h
 
 		encoder.Encode(&httpapi.Error{Error: err.Error()})
 	}
+
+	w.WriteHeader(http.StatusNoContent)
 }
diff --git a/pubsub/httpapi.go b/pubsub/httpapi.go
@@ -59,6 +59,7 @@ func (h HTTPAPI) deleteSubscription(w http.ResponseWriter, r *http.Request, para
 		}
 		encoder.Encode(&httpapi.Error{Error: err.Error()})
 	}
+
 	w.WriteHeader(http.StatusNoContent)
 }
 

diff --git a/targetcache/cache.go b/targetcache/cache.go
@@ -60,7 +60,7 @@ func newFunctionCache(log *zap.Logger) *functionCache {
 func (c *functionCache) Set(k string, v []byte) {
 	f := &functions.Function{}
 	err := json.NewDecoder(bytes.NewReader(v)).Decode(f)
-	c.log.Debug("Function cache received set key.", zap.String("key", k), zap.String("value", string(v)))
+	c.log.Debug("Function local cache received value update.", zap.String("key", k), zap.String("value", string(v)))
 	if err != nil {
 		c.log.Error("Could not deserialize Function state!", zap.Error(err), zap.String("key", k))
 	} else {
@@ -93,7 +93,7 @@ func newEndpointCache(log *zap.Logger) *endpointCache {
 func (c *endpointCache) Set(k string, v []byte) {
 	e := &pubsub.Endpoint{}
 	err := json.NewDecoder(bytes.NewReader(v)).Decode(e)
-	c.log.Debug("Endpoint cache received set key.", zap.String("key", k), zap.String("value", string(v)))
+	c.log.Debug("Endpoint local cache received value update.", zap.String("key", k), zap.String("value", string(v)))
 	if err != nil {
 		c.log.Error("Could not deserialize Endpoint state!", zap.Error(err), zap.String("key", k))
 	} else {
@@ -127,7 +127,7 @@ func newSubscriptionCache(log *zap.Logger) *subscriptionCache {
 func (c *subscriptionCache) Set(k string, v []byte) {
 	s := pubsub.Subscription{}
 	err := json.NewDecoder(bytes.NewReader(v)).Decode(&s)
-	c.log.Debug("Subscription cache received set key.", zap.String("key", k), zap.String("value", string(v)))
+	c.log.Debug("Subscription local cache received value update.", zap.String("key", k), zap.String("value", string(v)))
 	if err != nil {
 		c.log.Error("Could not deserialize Subscription state!", zap.Error(err), zap.String("key", k))
 		return