update

aquasecurity · May 6, 2019 · da9ab52 · da9ab52
1 parent e25cfab
commit da9ab52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/goreleaser.yml b/goreleaser.yml
@@ -17,7 +17,6 @@ builds:
     binary: trivy
     ldflags: 
       - -s -w
-      - "-extldflags '-static'"
     env:
       - CGO_ENABLED=1
     goos:
@@ -26,7 +25,9 @@ builds:
       - amd64
   - main: cmd/trivy/main.go
     binary: trivy
-    ldflags: -s -w
+    ldflags: 
+      - -s -w
+      - "-extldflags '-static'"
     env:
       - CGO_ENABLED=0
     goos:

diff --git a/pkg/log/logger.go b/pkg/log/logger.go
@@ -3,6 +3,7 @@ package log
 import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	"golang.org/x/xerrors"
 )
 
 var Logger *zap.SugaredLogger
@@ -45,11 +46,10 @@ func newLogger(debug bool) (*zap.SugaredLogger, error) {
 		OutputPaths:      []string{"stdout"},
 		ErrorOutputPaths: []string{"stderr"},
 	}
-	logger, _ := myConfig.Build()
+	logger, err := myConfig.Build()
+	if err != nil {
+		return nil, xerrors.Errorf("failed to build zap config: %w", err)
+	}
 
-	//logger, err := zap.NewDevelopment()
-	//if err != nil {
-	//	return nil, err
-	//}
 	return logger.Sugar(), nil
 }