diff --git a/.gitignore b/.gitignore index 76f322c..a0185f8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ agent.md config.json bot_user_config.json +bot_node_config.json *.exe nukumizu-linux-amd64 diff --git a/global/variables.go b/global/variables.go index ba3e210..899ab26 100644 --- a/global/variables.go +++ b/global/variables.go @@ -22,3 +22,15 @@ var SoftwareInfo = SoftwareInfoStr{ BuildType: "Debug", BuildTime: "unknown", } + +type ConfigPathStr struct { + Global string + BotUserConfig string + BotNodeConfig string +} + +var ConfigPath = ConfigPathStr{ + Global: "config.json", + BotUserConfig: "bot_user_config.json", + BotNodeConfig: "bot_node_config.json", +} \ No newline at end of file diff --git a/main.go b/main.go index 49c4a65..f6d0c5c 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "flag" "fmt" "log" "net/http" @@ -34,21 +33,16 @@ func main() { global.SoftwareInfo.CommitHash = CommitHash global.SoftwareInfo.BuildTime = BuildTime - // Parse CLI flags. - configPath_global := flag.String("config", "config.json", "Path to configuration file") - configPath_bot_user := flag.String("bot-user-config", "bot_user_config.json", "Path to bot user configuration file") - flag.Parse() - // Log startup banner. postLog.Info(fmt.Sprintf("%s Ver.%s.%d.%s.%s Developed by %s at %s", global.SoftwareInfo.Name, global.SoftwareInfo.Version, global.SoftwareInfo.BuildVer, global.SoftwareInfo.BuildType, global.SoftwareInfo.CommitHash, global.SoftwareInfo.Developer, global.SoftwareInfo.BuildTime)) // Load configuration. - cfg, err := config.LoadGlobalConfig(*configPath_global) + cfg, err := config.LoadGlobalConfig(global.ConfigPath.Global) if err != nil { log.Fatalf("Failed to load global config: %v", err) } - _, err = config.LoadBotUserConfig(*configPath_bot_user) + _, err = config.LoadBotUserConfig(global.ConfigPath.BotUserConfig) if err != nil { log.Fatalf("Failed to load bot user config: %v", err) }