Update initializing configs

cloud-barista · Apr 19, 2022 · 0ee0bc0 · 0ee0bc0
1 parent d201e28
commit 0ee0bc0
Show file tree

Hide file tree

Showing 5 changed files with 237 additions and 124 deletions.
diff --git a/poc-cb-net/cmd/admin-web/admin-web.go b/poc-cb-net/cmd/admin-web/admin-web.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"html/template"
 	"io"
@@ -42,42 +43,69 @@ var systemManagementClient pb.SystemManagementServiceClient
 
 func init() {
 	fmt.Println("Start......... init() of admin-web.go")
-	ex, err := os.Executable()
-	if err != nil {
-		panic(err)
-	}
-	exePath := filepath.Dir(ex)
-	fmt.Printf("exePath: %v\n", exePath)
 
-	// Load cb-log config from the current directory (usually for the production)
-	logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
-	fmt.Printf("logConfPath: %v\n", logConfPath)
-	if !file.Exists(logConfPath) {
-		// Load cb-log config from the project directory (usually for development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
+	// Set cb-log
+	env := os.Getenv("CBLOG_ROOT")
+	if env != "" {
+		// Load cb-log config from the environment variable path (default)
+		fmt.Printf("CBLOG_ROOT: %v\n", env)
+		CBLogger = cblog.GetLogger("cb-network")
+	} else {
+
+		// Load cb-log config from the current directory (usually for the production)
+		ex, err := os.Executable()
 		if err != nil {
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		logConfPath = filepath.Join(projectPath, "poc-cb-net", "config", "log_conf.yaml")
+		exePath := filepath.Dir(ex)
+		fmt.Printf("exe path: %v\n", exePath)
+
+		logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
+		if file.Exists(logConfPath) {
+			fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+			CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+
+		} else {
+			// Load cb-log config from the project directory (usually for development)
+			logConfPath = filepath.Join(exePath, "..", "..", "config", "log_conf.yaml")
+			if file.Exists(logConfPath) {
+				fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+				CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+			} else {
+				err := errors.New("fail to load log_conf.yaml")
+				panic(err)
+			}
+		}
+		CBLogger.Debugf("Load %v", logConfPath)
+
 	}
-	CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
-	CBLogger.Debugf("Load %v", logConfPath)
 
 	// Load cb-network config from the current directory (usually for the production)
+	ex, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	exePath := filepath.Dir(ex)
+	fmt.Printf("exe path: %v\n", exePath)
+
 	configPath := filepath.Join(exePath, "config", "config.yaml")
-	fmt.Printf("configPath: %v\n", configPath)
-	if !file.Exists(configPath) {
+	if file.Exists(configPath) {
+		fmt.Printf("path of config.yaml: %v\n", configPath)
+		config, _ = model.LoadConfig(configPath)
+	} else {
 		// Load cb-network config from the project directory (usually for the development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-		if err != nil {
+		configPath = filepath.Join(exePath, "..", "..", "config", "config.yaml")
+
+		if file.Exists(configPath) {
+			config, _ = model.LoadConfig(configPath)
+		} else {
+			err := errors.New("fail to load config.yaml")
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		configPath = filepath.Join(projectPath, "poc-cb-net", "config", "config.yaml")
 	}
-	config, _ = model.LoadConfig(configPath)
+
 	CBLogger.Debugf("Load %v", configPath)
+
 	fmt.Println("End......... init() of admin-web.go")
 }
 

diff --git a/poc-cb-net/cmd/agent/agent.go b/poc-cb-net/cmd/agent/agent.go
@@ -3,9 +3,9 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"strconv"
@@ -36,44 +36,69 @@ var config model.Config
 
 func init() {
 	fmt.Println("Start......... init() of agent.go")
-	ex, err := os.Executable()
-	if err != nil {
-		panic(err)
-	}
-	exePath := filepath.Dir(ex)
-	fmt.Printf("exePath: %v\n", exePath)
-
-	// Load cb-log config from the current directory (usually for the production)
-	logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
-	fmt.Printf("logConfPath: %v\n", logConfPath)
-	if !file.Exists(logConfPath) {
-		fmt.Printf("not exist - %v\n", logConfPath)
-		// Load cb-log config from the project directory (usually for development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-		fmt.Printf("projectRoot: %v\n", string(path))
+
+	// Set cb-log
+	env := os.Getenv("CBLOG_ROOT")
+	if env != "" {
+		// Load cb-log config from the environment variable path (default)
+		fmt.Printf("CBLOG_ROOT: %v\n", env)
+		CBLogger = cblog.GetLogger("cb-network")
+	} else {
+
+		// Load cb-log config from the current directory (usually for the production)
+		ex, err := os.Executable()
 		if err != nil {
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		logConfPath = filepath.Join(projectPath, "poc-cb-net", "config", "log_conf.yaml")
+		exePath := filepath.Dir(ex)
+		fmt.Printf("exe path: %v\n", exePath)
+
+		logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
+		if file.Exists(logConfPath) {
+			fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+			CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+
+		} else {
+			// Load cb-log config from the project directory (usually for development)
+			logConfPath = filepath.Join(exePath, "..", "..", "config", "log_conf.yaml")
+			if file.Exists(logConfPath) {
+				fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+				CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+			} else {
+				err := errors.New("fail to load log_conf.yaml")
+				panic(err)
+			}
+		}
+		CBLogger.Debugf("Load %v", logConfPath)
+
 	}
-	CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
-	CBLogger.Debugf("Load %v", logConfPath)
 
 	// Load cb-network config from the current directory (usually for the production)
+	ex, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	exePath := filepath.Dir(ex)
+	fmt.Printf("exe path: %v\n", exePath)
+
 	configPath := filepath.Join(exePath, "config", "config.yaml")
-	fmt.Printf("configPath: %v\n", configPath)
-	if !file.Exists(configPath) {
+	if file.Exists(configPath) {
+		fmt.Printf("path of config.yaml: %v\n", configPath)
+		config, _ = model.LoadConfig(configPath)
+	} else {
 		// Load cb-network config from the project directory (usually for the development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-		if err != nil {
+		configPath = filepath.Join(exePath, "..", "..", "config", "config.yaml")
+
+		if file.Exists(configPath) {
+			config, _ = model.LoadConfig(configPath)
+		} else {
+			err := errors.New("fail to load config.yaml")
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		configPath = filepath.Join(projectPath, "poc-cb-net", "config", "config.yaml")
 	}
-	config, _ = model.LoadConfig(configPath)
+
 	CBLogger.Debugf("Load %v", configPath)
+
 	fmt.Println("End......... init() of agent.go")
 }
 

diff --git a/poc-cb-net/cmd/controller/controller.go b/poc-cb-net/cmd/controller/controller.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -31,44 +30,69 @@ var config model.Config
 
 func init() {
 	fmt.Println("Start......... init() of controller.go")
-	ex, err := os.Executable()
-	if err != nil {
-		panic(err)
-	}
-	exePath := filepath.Dir(ex)
-	fmt.Printf("exePath: %v\n", exePath)
-
-	// Load cb-log config from the current directory (usually for the production)
-	logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
-	fmt.Printf("logConfPath: %v\n", logConfPath)
-	if !file.Exists(logConfPath) {
-		fmt.Printf("not exist - %v\n", logConfPath)
-		// Load cb-log config from the project directory (usually for development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-		fmt.Printf("projectRoot: %v\n", string(path))
+
+	// Set cb-log
+	env := os.Getenv("CBLOG_ROOT")
+	if env != "" {
+		// Load cb-log config from the environment variable path (default)
+		fmt.Printf("CBLOG_ROOT: %v\n", env)
+		CBLogger = cblog.GetLogger("cb-network")
+	} else {
+
+		// Load cb-log config from the current directory (usually for the production)
+		ex, err := os.Executable()
 		if err != nil {
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		logConfPath = filepath.Join(projectPath, "poc-cb-net", "config", "log_conf.yaml")
+		exePath := filepath.Dir(ex)
+		fmt.Printf("exe path: %v\n", exePath)
+
+		logConfPath := filepath.Join(exePath, "config", "log_conf.yaml")
+		if file.Exists(logConfPath) {
+			fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+			CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+
+		} else {
+			// Load cb-log config from the project directory (usually for development)
+			logConfPath = filepath.Join(exePath, "..", "..", "config", "log_conf.yaml")
+			if file.Exists(logConfPath) {
+				fmt.Printf("path of log_conf.yaml: %v\n", logConfPath)
+				CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
+			} else {
+				err := errors.New("fail to load log_conf.yaml")
+				panic(err)
+			}
+		}
+		CBLogger.Debugf("Load %v", logConfPath)
+
 	}
-	CBLogger = cblog.GetLoggerWithConfigPath("cb-network", logConfPath)
-	CBLogger.Debugf("Load %v", logConfPath)
 
 	// Load cb-network config from the current directory (usually for the production)
+	ex, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	exePath := filepath.Dir(ex)
+	fmt.Printf("exe path: %v\n", exePath)
+
 	configPath := filepath.Join(exePath, "config", "config.yaml")
-	fmt.Printf("configPath: %v\n", configPath)
-	if !file.Exists(configPath) {
+	if file.Exists(configPath) {
+		fmt.Printf("path of config.yaml: %v\n", configPath)
+		config, _ = model.LoadConfig(configPath)
+	} else {
 		// Load cb-network config from the project directory (usually for the development)
-		path, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-		if err != nil {
+		configPath = filepath.Join(exePath, "..", "..", "config", "config.yaml")
+
+		if file.Exists(configPath) {
+			config, _ = model.LoadConfig(configPath)
+		} else {
+			err := errors.New("fail to load config.yaml")
 			panic(err)
 		}
-		projectPath := strings.TrimSpace(string(path))
-		configPath = filepath.Join(projectPath, "poc-cb-net", "config", "config.yaml")
 	}
-	config, _ = model.LoadConfig(configPath)
+
 	CBLogger.Debugf("Load %v", configPath)
+
 	fmt.Println("End......... init() of controller.go")
 }