Merge pull request #54 from mercari/update-dep

logger: followed upstream change of uber-go/zap.

cmd/gaurun/gaurun.go

@@ -47,22 +47,15 @@ func main() {
 	}
 
 	// set logger
-	accessLogger, err := gaurun.InitLog(gaurun.ConfGaurun.Log.AccessLog)
+	accessLogger, err := gaurun.InitLog(gaurun.ConfGaurun.Log.AccessLog, "info")
 	if err != nil {
 		gaurun.LogSetupFatal(err)
 	}
-	errorLogger, err := gaurun.InitLog(gaurun.ConfGaurun.Log.ErrorLog)
+	errorLogger, err := gaurun.InitLog(gaurun.ConfGaurun.Log.ErrorLog, gaurun.ConfGaurun.Log.Level)
 	if err != nil {
 		gaurun.LogSetupFatal(err)
 	}
 
-	if err := gaurun.SetLogLevel(accessLogger, "info"); err != nil {
-		gaurun.LogSetupFatal(err)
-	}
-	if err := gaurun.SetLogLevel(errorLogger, gaurun.ConfGaurun.Log.Level); err != nil {
-		gaurun.LogSetupFatal(err)
-	}
-
 	gaurun.LogAccess = accessLogger
 	gaurun.LogError = errorLogger
 

gaurun/log.go

@@ -39,7 +39,7 @@ type LogPushEntry struct {
 	Expiry           int    `json:"expiry,omitempty"`
 }
 
-func InitLog(outString string) (zap.Logger, error) {
+func InitLog(outString string, levelString string) (zap.Logger, error) {
 	var writer zap.WriteSyncer
 	switch outString {
 	case "stdout":
@@ -60,16 +60,13 @@ func InitLog(outString string) (zap.Logger, error) {
 			return zap.String("time", t.Local().Format("2006/01/02 15:04:05 MST"))
 		}),
 	)
-	return zap.New(encoder, zap.Output(writer), zap.ErrorOutput(writer)), nil
-}
 
-func SetLogLevel(log zap.Logger, levelString string) error {
 	var level zap.Level
 	if err := level.UnmarshalText([]byte(levelString)); err != nil {
-		return err
+		return nil, err
 	}
-	log.SetLevel(level)
-	return nil
+
+	return zap.New(encoder, level, zap.Output(writer), zap.ErrorOutput(writer)), nil
 }
 
 // LogSetupFatal output error log with log package and exit immediately.

glide.yaml

@@ -9,10 +9,6 @@ import:
   - payload/badge
   - push
 - package: github.com/mercari/gcm
-  version: 987b1dc4ce9034b698395d35de1aadf999388b8f
 - package: github.com/fukata/golang-stats-api-handler
-  version: e7ee1630fdb679c86ec8e3d0755e3576675fdb10
 - package: github.com/stretchr/testify
-  version: v1.1.3
 - package: github.com/uber-go/zap
-  version: f1942381637c11a802c356e70ab5b0a953540bb5