From 87fb76f15797daa734a19ae88f2b1fcd7ad66bf5 Mon Sep 17 00:00:00 2001 From: Roi Feng <37480123+Rayzggz@users.noreply.github.com> Date: Thu, 22 May 2025 15:58:48 -0400 Subject: [PATCH] feat: Default Main config --- internal/config/config.go | 18 ++++++++++++++++-- main.go | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index b5a0f35..fd49fcb 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -27,6 +27,20 @@ type MainConfig struct { // LoadMainConfig Read the configuration file and return the configuration object func LoadMainConfig(basePath string) (*MainConfig, error) { + + defaultCfg := MainConfig{ + Port: "25555", + WebPath: "/torii", + RulePath: "/www/server_torii/config/rules", + ErrorPage: "/www/server_torii/config/error_page", + LogPath: "/www/server_torii/log/", + NodeName: "Server Torii", + ConnectingHostHeaders: []string{"Torii-Real-Host"}, + ConnectingIPHeaders: []string{"Torii-Real-IP"}, + ConnectingURIHeaders: []string{"Torii-Original-URI"}, + ConnectingCaptchaStatusHeaders: []string{"Torii-Captcha-Status"}, + } + exePath, err := os.Executable() if err != nil { return nil, err @@ -38,12 +52,12 @@ func LoadMainConfig(basePath string) (*MainConfig, error) { data, err := os.ReadFile(configPath) if err != nil { - return nil, err + return &defaultCfg, err } var cfg MainConfig if err := yaml.Unmarshal(data, &cfg); err != nil { - return nil, err + return &defaultCfg, err } return &cfg, nil diff --git a/main.go b/main.go index ac72194..a9a4302 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ func main() { // Load MainConfig cfg, err := config.LoadMainConfig(basePath) if err != nil { - log.Fatalf("Load config failed: %v", err) + log.Printf("[ERROR] Load config failed: %v. Using default config.", err) } // Load rules