logging improvements

cmd/varnish-cache-invalidator/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"io/ioutil"
-	"log"
 	"os"
 	"strings"
 	"varnish-cache-invalidator/internal/k8s"
@@ -32,19 +31,17 @@ func init() {
 
 func main() {
 	defer func() {
-		err := logger.Sync()
-		if err != nil {
+		if err := logger.Sync(); err != nil {
 			panic(err)
 		}
 	}()
 
 	// below check ensures that if our Varnish instances inside kubernetes or not
 	if opts.InCluster {
 		logger.Info("will use kubernetes pod instances, running pod informer to fetch pods")
-		k8s.InitK8sTypes()
+		// k8s.InitK8sTypes()
 		go k8s.RunPodInformer()
 	} else {
-		log.Println(opts.TargetHosts)
 		splitted := strings.Split(opts.TargetHosts, ",")
 		logger.Info("will use standalone varnish instances", zap.Any("instances", splitted))
 		for _, v := range splitted {

internal/k8s/informers.go

@@ -25,8 +25,18 @@ var (
 )
 
 func init() {
-	logger = logging.GetLogger()
 	opts = options.GetVarnishCacheInvalidatorOptions()
+	logger = logging.GetLogger()
+	logger.Info("initializing kube client")
+	if restConfig, err = getConfig(); err != nil {
+		logger.Fatal("fatal error occurred while initializing kube client", zap.String("error", err.Error()))
+	}
+	if clientSet, err = getClientSet(restConfig); err != nil {
+		logger.Fatal("fatal error occurred while getting client set", zap.String("error", err.Error()))
+	}
+
+	logger = logger.With(zap.Bool("inCluster", opts.InCluster), zap.String("masterIp", restConfig.Host),
+		zap.String("varnishLabel", opts.VarnishLabel), zap.String("varnishNamespace", opts.VarnishNamespace))
 }
 
 // InitK8sTypes initializes the required k8s types rest.Config and kubernetes.ClientSet