From 96c2695f43821edc4c0575d3fd867d93eba99c69 Mon Sep 17 00:00:00 2001
From: Nehashri <neha.nehe@gmail.com>
Date: Fri, 19 Apr 2019 12:30:03 +0530
Subject: [PATCH] initializing logger in persistent pre run, reinitializing
 after loading environment, #1387

---
 .travis.yml     | 4 +---
 cmd/cmd.go      | 3 ++-
 cmd/daemon.go   | 2 +-
 cmd/docs.go     | 2 +-
 cmd/format.go   | 2 +-
 cmd/refactor.go | 2 +-
 cmd/run.go      | 2 +-
 cmd/run_test.go | 9 +++++----
 cmd/validate.go | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e05ed58ac..490709928 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,9 @@ go:
 addons:
   apt:
     packages:
-      - oracle-java8-set-default
+      - default-jdk
 env:
   - GAUGE_PREFIX="/tmp/gauge" GAUGE_TELEMETRY_ENABLED=false
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export JAVA_HOME="/usr/lib/jvm/java-8-oracle"; fi
 script:
   - go run build/make.go
   - go run build/make.go --test
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 3c192e51f..d2d6b0abe 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -64,6 +64,7 @@ var (
 		},
 		DisableAutoGenTag: true,
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			initLogger(cmd.Name())
 			skel.CreateSkelFilesIfRequired()
 			track.Init()
 			config.SetProjectRoot(args)
@@ -215,7 +216,7 @@ var exit = func(err error, additionalText string) {
 	os.Exit(0)
 }
 
-func loadEnvAndInitLogger(cmd *cobra.Command) {
+func loadEnvAndReinitLogger(cmd *cobra.Command) {
 	if e := env.LoadEnv(environment); e != nil {
 		logger.Fatalf(true, e.Error())
 	}
diff --git a/cmd/daemon.go b/cmd/daemon.go
index 6cb37d3b1..d981f703a 100644
--- a/cmd/daemon.go
+++ b/cmd/daemon.go
@@ -45,7 +45,7 @@ var (
 			if err := config.SetProjectRoot(args); err != nil {
 				exit(err, cmd.UsageString())
 			}
-			loadEnvAndInitLogger(cmd)
+			loadEnvAndReinitLogger(cmd)
 			manifest, _ := manifest.ProjectManifest()
 			language := manifest.Language
 			if lsp {
diff --git a/cmd/docs.go b/cmd/docs.go
index ecffd378d..04efd95f1 100644
--- a/cmd/docs.go
+++ b/cmd/docs.go
@@ -32,7 +32,7 @@ var docsCmd = &cobra.Command{
 	Long:    `Generate documentation using specified plugin.`,
 	Example: "  gauge docs spectacle specs/",
 	Run: func(cmd *cobra.Command, args []string) {
-		loadEnvAndInitLogger(cmd)
+		loadEnvAndReinitLogger(cmd)
 		if err := config.SetProjectRoot(args); err != nil {
 			exit(err, cmd.UsageString())
 		}
diff --git a/cmd/format.go b/cmd/format.go
index c047fb91e..c463c69a9 100644
--- a/cmd/format.go
+++ b/cmd/format.go
@@ -29,7 +29,7 @@ var formatCmd = &cobra.Command{
 	Long:    `Formats the specified spec files.`,
 	Example: "  gauge format specs/",
 	Run: func(cmd *cobra.Command, args []string) {
-		loadEnvAndInitLogger(cmd)
+		loadEnvAndReinitLogger(cmd)
 		if err := config.SetProjectRoot(args); err != nil {
 			exit(err, cmd.UsageString())
 		}
diff --git a/cmd/refactor.go b/cmd/refactor.go
index 63a6ebff8..e991ff2a2 100644
--- a/cmd/refactor.go
+++ b/cmd/refactor.go
@@ -34,7 +34,7 @@ var refactorCmd = &cobra.Command{
 	Long:    `Refactor steps.`,
 	Example: `  gauge refactor "old step" "new step"`,
 	Run: func(cmd *cobra.Command, args []string) {
-		loadEnvAndInitLogger(cmd)
+		loadEnvAndReinitLogger(cmd)
 		if len(args) < 2 {
 			exit(fmt.Errorf("Refactor command needs at least two arguments."), cmd.UsageString())
 		}
diff --git a/cmd/run.go b/cmd/run.go
index c1bc396b4..95f88e42c 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -208,7 +208,7 @@ func installMissingPlugins(flag bool) {
 }
 
 func execute(cmd *cobra.Command, args []string) {
-	loadEnvAndInitLogger(cmd)
+	loadEnvAndReinitLogger(cmd)
 	if parallel && tagsToFilterForParallelRun != "" && !env.AllowFilteredParallelExecution() {
 		logger.Fatal(true, "Filtered parallel execution is a experimental feature. It can be enabled via allow_filtered_parallel_execution property.")
 	}
diff --git a/cmd/run_test.go b/cmd/run_test.go
index dc1569e50..8d3f8e951 100644
--- a/cmd/run_test.go
+++ b/cmd/run_test.go
@@ -19,15 +19,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var path = ""
+var projectPath = ""
 
 func before() {
-	path, _ = filepath.Abs("_testData")
-	config.ProjectRoot = path
+	projectPath, _ = filepath.Abs("_testData")
+	config.ProjectRoot = projectPath
 }
 
 func after() {
-	os.RemoveAll(path)
+	os.RemoveAll(projectPath)
 }
 
 func TestMain(m *testing.M) {
@@ -416,6 +416,7 @@ func TestLogLevelCanBeOverriddenForRepeat(t *testing.T) {
 func TestCorrectFlagsAreSetForRepeat(t *testing.T) {
 	if os.Getenv("TEST_EXITS") == "1" {
 		// expect "env" to be set to "test"
+		os.MkdirAll(filepath.Join(projectPath, "env", "test"), 0755)
 		execution.ExecuteSpecs = func(s []string) int {
 			f, err := runCmd.Flags().GetString(environmentName)
 			if err != nil {
diff --git a/cmd/validate.go b/cmd/validate.go
index 13c90ba15..3d750918e 100644
--- a/cmd/validate.go
+++ b/cmd/validate.go
@@ -35,7 +35,7 @@ var (
 		Long:    `Check for validation and parse errors.`,
 		Example: "  gauge validate specs/",
 		Run: func(cmd *cobra.Command, args []string) {
-			loadEnvAndInitLogger(cmd)
+			loadEnvAndReinitLogger(cmd)
 			validation.HideSuggestion = hideSuggestion
 			if err := config.SetProjectRoot(args); err != nil {
 				exit(err, cmd.UsageString())