Merge pull request #8 from packethost/logging

Fix requests using echo logger instead of global zap logger

cmd/aws-s3-proxy/pkg/root.go

@@ -88,10 +88,10 @@ func setupLogging() {
 		cfg = zap.NewDevelopmentConfig()
 	}
 
+	// Level is already at InfoLevel, so only change to DebugLevel
+	// when the flag is set
 	if viper.GetBool("logging.debug") {
-		cfg.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
-	} else {
-		cfg.Level = zap.NewAtomicLevelAt(zap.InfoLevel)
+		cfg.Level.SetLevel(zap.DebugLevel)
 	}
 
 	l, err := cfg.Build()

internal/config/config.go

@@ -17,9 +17,6 @@ import (
 // Cfg represents its configurations
 var Cfg *Config
 
-// Logger exports a logger to be used by all parts of the application
-var Logger *zap.SugaredLogger
-
 // ReadThrough holds info if we are transparently reading back to upstream
 type ReadThrough struct {
 	Enabled        bool
@@ -66,7 +63,7 @@ type ServerOpts struct {
 type Config struct {
 	HTTPOpts       HTTPOpts
 	ServerOpts     ServerOpts
-	Logger         zap.SugaredLogger
+	Logger         *zap.SugaredLogger
 	SecondaryStore Bucket
 	PrimaryStore   Bucket
 	ReadThrough    ReadThrough
@@ -78,12 +75,12 @@ func Load(ctx context.Context, l *zap.SugaredLogger) {
 		log.Fatalf("Unable to decode into struct, %v", err)
 	}
 
-	Logger = l
+	Cfg.Logger = l
 
 	Cfg.PrimaryStore.BuildS3API()
 	Cfg.SecondaryStore.BuildS3API()
 
-	Logger.Info("configuration loaded")
+	Cfg.Logger.Info("configuration loaded")
 }
 
 // BuildS3API creates a client per bucket

internal/s3/controller.go

@@ -103,7 +103,7 @@ func AwsS3Get(e echo.Context) error {
 	get, err := get(req.Context(), &c.PrimaryStore, path, rangeHeader)
 	if err != nil {
 		if c.ReadThrough.Enabled {
-			e.Logger().Warn("err in primary, trying secondary")
+			c.Logger.Warn("err in primary, trying secondary")
 			return trySecondary(e)
 		}
 
@@ -115,7 +115,7 @@ func AwsS3Get(e echo.Context) error {
 			status, _ = strconv.Atoi(statusStr[1])
 		}
 
-		e.Logger().Errorf("status %d", status)
+		c.Logger.Errorf("status %d", status)
 
 		return e.String(status, err.Error())
 	}

internal/s3/handler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/packethost/aws-s3-proxy/internal/config"
 )
 
-// Handler wraps every the controllers
+// Handler wraps every controller
 func Handler(handler echo.HandlerFunc) echo.HandlerFunc {
 	return echo.HandlerFunc(func(e echo.Context) error {
 		h := config.Cfg.HTTPOpts

internal/s3/s3.go

@@ -24,7 +24,7 @@ type Upload struct {
 // Get returns a specified object from Amazon S3
 func get(ctx context.Context, bucket *config.Bucket, key, rangeHeader *string) (*Download, error) {
 	if bucket.Session == nil {
-		config.Logger.Panic("bad s3 client")
+		config.Cfg.Logger.Panic("bad s3 client")
 	}
 
 	req := &s3.GetObjectInput{