CORD-16295 | kibana logger fix, change order of multi logger, close a…

…nd open conection for each write (#70)

cmd/consul-registration-hook/main.go

@@ -272,6 +272,6 @@ func main() {
 
 	log.Printf("consul-registration-hook (version: %s)", version)
 	if err := app.Run(os.Args); err != nil {
-		log.Fatal(err)
+		log.Fatalf("Execution failed: %s", err)
 	}
 }

logger/logger.go

@@ -23,11 +23,12 @@ type Msg struct {
 }
 
 type KibanaWriter struct {
-	pod       string
-	namespace string
-	variant   string
-	scid      string
-	netWrite  net.Conn
+	pod           string
+	namespace     string
+	variant       string
+	scid          string
+	netWrite      net.Conn
+	loggerAddress string
 }
 
 func NewKibanaWriter() (*KibanaWriter, error) {
@@ -39,19 +40,15 @@ func NewKibanaWriter() (*KibanaWriter, error) {
 		loggerAddress = defaultLoggerAddress
 	}
 
-	netWrite, err := net.Dial("tcp", loggerAddress)
-	if err != nil {
-		return nil, fmt.Errorf("error: %s", err)
-	}
 	pod := os.Getenv("KUBERNETES_POD_NAME")
 	namespace := os.Getenv("KUBERNETES_POD_NAMESPACE")
 	variant := os.Getenv("VARIANT_NAME")
 	return &KibanaWriter{
-		netWrite:  netWrite,
-		pod:       pod,
-		namespace: namespace,
-		variant:   variant,
-		scid:      scid,
+		loggerAddress: loggerAddress,
+		pod:           pod,
+		namespace:     namespace,
+		variant:       variant,
+		scid:          scid,
 	}, nil
 }
 
@@ -63,18 +60,24 @@ func (k KibanaWriter) Write(p []byte) (n int, err error) {
 		Namespace: k.namespace,
 		Variant:   k.variant,
 	}
+	netWrite, err := net.Dial("tcp", k.loggerAddress)
+	if err != nil {
+		return 0, fmt.Errorf("error: %s", err)
+	}
+	defer netWrite.Close()
+
 	writeTemplate, err := json.Marshal(msg)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
-	return k.netWrite.Write(writeTemplate)
+	return netWrite.Write(writeTemplate)
 }
 
 func ConfigureLogger() {
 	kibanaWriter, err := NewKibanaWriter()
 	if err != nil {
 		log.Printf("Unable to initialize kibana logger: %s", err)
 	}
-	log.SetOutput(io.MultiWriter(kibanaWriter, os.Stdout))
+	log.SetOutput(io.MultiWriter(os.Stdout, kibanaWriter))
 }