buyfakett/server_torii
1
0
Fork 0
mirror of https://github.com/Rayzggz/server_torii.git synced 2025-06-21 14:31:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix config

Browse Source
This commit is contained in:
buyfakett
2025-05-08 10:08:36 +08:00
parent 4a9afa8784
commit c69c5b5cd7
7 changed files with 122 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@ -1,6 +1,7 @@
package main
import (
_ "embed"
"flag"
"log"
"os"
@ -15,6 +16,9 @@ import (
"time"
)
//go:embed config/default.yaml
var defaultConfigContent []byte
func main() {
var basePath string
flag.StringVar(&basePath, "prefix", "", "Config file base path")
@ -25,21 +29,18 @@ func main() {
}
// Load MainConfig
cfg, err := config.LoadMainConfig(basePath)
if err != nil {
log.Fatalf("Load config failed: %v", err)
}
config.InitConfig(defaultConfigContent)
// Load rules
ruleSet, err := config.LoadRules(cfg.RulePath)
ruleSet, err := config.LoadRules(config.Cfg.Server.RulePath)
if err != nil {
log.Fatalf("Load rules failed: %v", err)
}
log.Printf("Ready to start server on port %s", cfg.Port)
log.Printf("Ready to start server on port %s", config.Cfg.Server.Port)
//set log file
defaultLogPath := filepath.Join(cfg.LogPath + "server_torii.log")
defaultLogPath := filepath.Join(config.Cfg.Server.LogPath + "server_torii.log")
logFile, err := os.OpenFile(defaultLogPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
log.Fatalf("Failed to open log file: %v", err)
@ -52,7 +53,7 @@ func main() {
}(logFile)
log.SetOutput(logFile)
utils.InitLogx(cfg.LogPath)
utils.InitLogx(config.Cfg.Server.LogPath)
//allocate shared memory
sharedMem := &dataType.SharedMemory{
@ -71,7 +72,7 @@ func main() {
serverErr := make(chan error, 1)
go func() {
serverErr <- server.StartServer(cfg, ruleSet, sharedMem)
serverErr <- server.StartServer(ruleSet, sharedMem)
}()
select {