use zap for logging (#1112)

Use zap for logging

controller/api.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	log "github.com/sirupsen/logrus"
+	"go.uber.org/zap"
 	apiv1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,6 +46,7 @@ func init() {
 
 type (
 	API struct {
+		logger            *zap.Logger
 		fissionClient     *crd.FissionClient
 		kubernetesClient  *kubernetes.Clientset
 		storageServiceUrl string
@@ -63,8 +64,8 @@ type (
 	}
 )
 
-func MakeAPI(featureStatus map[string]string) (*API, error) {
-	api, err := makeCRDBackedAPI()
+func MakeAPI(logger *zap.Logger, featureStatus map[string]string) (*API, error) {
+	api, err := makeCRDBackedAPI(logger)
 
 	u := os.Getenv("STORAGE_SERVICE_URL")
 	if len(u) > 0 {
@@ -119,7 +120,7 @@ func (api *API) respondWithError(w http.ResponseWriter, err error) {
 	}
 
 	code, msg := fission.GetHTTPError(err)
-	log.Errorf("Error: %v: %v", code, msg)
+	api.logger.Error(msg, zap.Int("code", code))
 	http.Error(w, msg, code)
 }
 
@@ -270,7 +271,8 @@ func (api *API) Serve(port int) {
 
 	address := fmt.Sprintf(":%v", port)
 
-	log.WithFields(log.Fields{"port": port}).Info("Server started")
-	r.Use(fission.LoggingMiddleware)
-	log.Fatal(http.ListenAndServe(address, r))
+	api.logger.Info("server started", zap.Int("port", port))
+	r.Use(fission.LoggingMiddleware(api.logger))
+	err := http.ListenAndServe(address, r)
+	api.logger.Fatal("done listening", zap.Error(err))
 }