Rename logging package

cmd/flagger/main.go

@@ -6,7 +6,7 @@ import (
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
 	informers "github.com/weaveworks/flagger/pkg/client/informers/externalversions"
 	"github.com/weaveworks/flagger/pkg/controller"
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"github.com/weaveworks/flagger/pkg/metrics"
 	"github.com/weaveworks/flagger/pkg/notifier"
 	"github.com/weaveworks/flagger/pkg/server"
@@ -58,7 +58,7 @@ func init() {
 func main() {
 	flag.Parse()
 
-	logger, err := logging.NewLoggerWithEncoding(logLevel, zapEncoding)
+	logger, err := logger.NewLoggerWithEncoding(logLevel, zapEncoding)
 	if err != nil {
 		log.Fatalf("Error creating logger: %v", err)
 	}

cmd/loadtester/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"github.com/weaveworks/flagger/pkg/loadtester"
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"github.com/weaveworks/flagger/pkg/signals"
 	"go.uber.org/zap"
 	"log"
@@ -30,7 +30,7 @@ func init() {
 func main() {
 	flag.Parse()
 
-	logger, err := logging.NewLoggerWithEncoding(logLevel, zapEncoding)
+	logger, err := logger.NewLoggerWithEncoding(logLevel, zapEncoding)
 	if err != nil {
 		log.Fatalf("Error creating logger: %v", err)
 	}

pkg/loadtester/runner_test.go

@@ -1,14 +1,14 @@
 package loadtester
 
 import (
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"testing"
 	"time"
 )
 
 func TestTaskRunner_Start(t *testing.T) {
 	stop := make(chan struct{})
-	logger, _ := logging.NewLogger("debug")
+	logger, _ := logger.NewLogger("debug")
 	tr := NewTaskRunner(logger, time.Hour)
 
 	go tr.Start(10*time.Millisecond, stop)

pkg/loadtester/task_ngrinder_test.go

@@ -3,7 +3,7 @@ package loadtester
 import (
 	"context"
 	"fmt"
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"gopkg.in/h2non/gock.v1"
 	"testing"
 	"time"
@@ -12,7 +12,7 @@ import (
 func TestTaskNGrinder(t *testing.T) {
 	server := "http://ngrinder:8080"
 	cloneId := "960"
-	logger, _ := logging.NewLoggerWithEncoding("debug", "console")
+	logger, _ := logger.NewLoggerWithEncoding("debug", "console")
 	canary := "podinfo.default"
 	taskFactory, ok := GetTaskFactory(TaskTypeNGrinder)
 	if !ok {

pkg/logger/logger.go

@@ -1,9 +1,6 @@
-package logging
+package logger
 
 import (
-	"fmt"
-	"os"
-
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -64,12 +61,3 @@ func NewLoggerWithEncoding(logLevel, zapEncoding string) (*zap.SugaredLogger, er
 	}
 	return logger.Sugar(), nil
 }
-
-// Console writes to stdout if the console env var exists
-func Console(a ...interface{}) (n int, err error) {
-	if os.Getenv("console") != "" {
-		return fmt.Fprintln(os.Stdout, a...)
-	}
-
-	return 0, nil
-}

pkg/router/router_test.go

@@ -6,7 +6,7 @@ import (
 	istiov1alpha3 "github.com/weaveworks/flagger/pkg/apis/istio/v1alpha3"
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
 	fakeFlagger "github.com/weaveworks/flagger/pkg/client/clientset/versioned/fake"
-	"github.com/weaveworks/flagger/pkg/logging"
+	"github.com/weaveworks/flagger/pkg/logger"
 	"go.uber.org/zap"
 	appsv1 "k8s.io/api/apps/v1"
 	hpav1 "k8s.io/api/autoscaling/v1"
@@ -35,7 +35,7 @@ func setupfakeClients() fakeClients {
 	kubeClient := fake.NewSimpleClientset(newMockDeployment(), newMockABTestDeployment())
 
 	meshClient := fakeFlagger.NewSimpleClientset()
-	logger, _ := logging.NewLogger("debug")
+	logger, _ := logger.NewLogger("debug")
 
 	return fakeClients{
 		canary:        canary,