Misc fixes

Add return after error in debug store handler.

Pass interface rather than interface generator when registering pod and
namespace handlers.

cmd/k8s.go

@@ -30,11 +30,7 @@ func (k8s *k8s) watchForPods(podManager kcache.ResourceEventHandler) kcache.Stor
 		k8s.createPodLW(),
 		&api.Pod{},
 		resyncPeriod,
-		kcache.ResourceEventHandlerFuncs{
-			AddFunc:    podManager.OnAdd,
-			DeleteFunc: podManager.OnDelete,
-			UpdateFunc: podManager.OnUpdate,
-		},
+		podManager,
 	)
 	go podController.Run(wait.NeverStop)
 	return podStore
@@ -50,11 +46,7 @@ func (k8s *k8s) watchForNamespaces(nsManager kcache.ResourceEventHandler) kcache
 		k8s.createNamespaceLW(),
 		&api.Namespace{},
 		resyncPeriod,
-		kcache.ResourceEventHandlerFuncs{
-			AddFunc:    nsManager.OnAdd,
-			DeleteFunc: nsManager.OnDelete,
-			UpdateFunc: nsManager.OnUpdate,
-		},
+		nsManager,
 	)
 	go nsController.Run(wait.NeverStop)
 	return nsStore

cmd/server.go

@@ -93,6 +93,7 @@ func (s *Server) debugStoreHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Errorf("Error converting debug map to json: %+v", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
 	}
 
 	w.Write(o)