Change log format (#30)

cmd/trivy/main.go

@@ -110,7 +110,7 @@ OPTIONS:
 	err := app.Run(os.Args)
 	if err != nil {
 		if log.Logger != nil {
-			log.Logger.Fatal(err)
+			log.Fatal(err)
 		}
 		l.Fatal(err)
 	}

pkg/log/logger.go

@@ -6,9 +6,13 @@ import (
 	"golang.org/x/xerrors"
 )
 
-var Logger *zap.SugaredLogger
+var (
+	Logger      *zap.SugaredLogger
+	debugOption bool
+)
 
 func InitLogger(debug bool) (err error) {
+	debugOption = debug
 	Logger, err = newLogger(debug)
 	if err != nil {
 		return xerrors.Errorf("error in new logger: %w", err)
@@ -29,8 +33,8 @@ func newLogger(debug bool) (*zap.SugaredLogger, error) {
 		Level:             level,
 		Encoding:          "console",
 		Development:       debug,
-		DisableStacktrace: !debug,
-		DisableCaller:     !debug,
+		DisableStacktrace: true,
+		DisableCaller:     true,
 		EncoderConfig: zapcore.EncoderConfig{
 			TimeKey:        "Time",
 			LevelKey:       "Level",
@@ -53,3 +57,10 @@ func newLogger(debug bool) (*zap.SugaredLogger, error) {
 
 	return logger.Sugar(), nil
 }
+
+func Fatal(err error) {
+	if debugOption {
+		Logger.Fatalf("%+v", err)
+	}
+	Logger.Fatal(err)
+}

pkg/run.go

@@ -73,7 +73,7 @@ func Run(c *cli.Context) (err error) {
 	autoRefresh := c.Bool("auto-refresh")
 	skipUpdate := c.Bool("skip-update")
 	if (refresh || autoRefresh) && skipUpdate {
-		log.Logger.Fatal("The --skip-update option can not be specified with the --refresh or --auto-refresh option")
+		return xerrors.New("The --skip-update option can not be specified with the --refresh or --auto-refresh option")
 	}
 
 	if err = db.Init(); err != nil {
@@ -84,7 +84,7 @@ func Run(c *cli.Context) (err error) {
 	dbVersion := db.GetVersion()
 	if dbVersion != "" && dbVersion != cliVersion {
 		if !autoRefresh {
-			log.Logger.Fatal("Detected version update of trivy. Please try again with --refresh or --auto-refresh option")
+			return xerrors.New("Detected version update of trivy. Please try again with --refresh or --auto-refresh option")
 		}
 		needRefresh = true
 	}