feat: wire config into main, server, and lobby
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
22
main.go
22
main.go
@@ -1,9 +1,11 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/tolelom/catacombs/config"
|
||||
"github.com/tolelom/catacombs/game"
|
||||
"github.com/tolelom/catacombs/server"
|
||||
"github.com/tolelom/catacombs/store"
|
||||
@@ -13,23 +15,35 @@ import (
|
||||
func main() {
|
||||
os.MkdirAll("data", 0755)
|
||||
|
||||
cfg, err := config.Load("config.yaml")
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
cfg, _ = config.Load("")
|
||||
} else {
|
||||
log.Fatalf("Failed to load config: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
db, err := store.Open("data/catacombs.db")
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to open database: %v", err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
lobby := game.NewLobby()
|
||||
lobby := game.NewLobby(cfg)
|
||||
|
||||
sshAddr := fmt.Sprintf("0.0.0.0:%d", cfg.Server.SSHPort)
|
||||
webAddr := fmt.Sprintf(":%d", cfg.Server.HTTPPort)
|
||||
|
||||
// Start web terminal server in background
|
||||
go func() {
|
||||
if err := web.Start(":8080", 2222); err != nil {
|
||||
if err := web.Start(webAddr, cfg.Server.SSHPort); err != nil {
|
||||
log.Printf("Web server error: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
log.Println("Catacombs server starting — SSH :2222, Web :8080")
|
||||
if err := server.Start("0.0.0.0", 2222, lobby, db); err != nil {
|
||||
log.Printf("Catacombs server starting — SSH :%d, Web :%d", cfg.Server.SSHPort, cfg.Server.HTTPPort)
|
||||
if err := server.Start(sshAddr, lobby, db); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user