Substantial game server update + DB break

pangbox · Jun 25, 2023 · 44ce684 · 44ce684
1 parent 1ee2657
commit 44ce684
Show file tree

Hide file tree

Showing 33 changed files with 3,566 additions and 226 deletions.
diff --git a/cmd/gameserver/main.go b/cmd/gameserver/main.go
@@ -26,6 +26,7 @@ import (
 	"github.com/pangbox/server/database"
 	"github.com/pangbox/server/database/accounts"
 	gameserver "github.com/pangbox/server/game/server"
+	"github.com/pangbox/server/gameconfig"
 	log "github.com/sirupsen/logrus"
 	"github.com/xo/dburl"
 )
@@ -72,6 +73,7 @@ func main() {
 			Database: db,
 			Hasher:   hash.Bcrypt{},
 		}),
+		ConfigProvider: gameconfig.Default(),
 	})
 	log.Fatalln(gameServer.Listen(ctx, listenAddr))
 }
diff --git a/cmd/loginserver/main.go b/cmd/loginserver/main.go
@@ -25,6 +25,7 @@ import (
 	"github.com/pangbox/server/common/topology"
 	"github.com/pangbox/server/database"
 	"github.com/pangbox/server/database/accounts"
+	"github.com/pangbox/server/gameconfig"
 	"github.com/pangbox/server/login"
 	log "github.com/sirupsen/logrus"
 	"github.com/xo/dburl"
@@ -72,6 +73,7 @@ func main() {
 			Database: db,
 			Hasher:   hash.Bcrypt{},
 		}),
+		ConfigProvider: gameconfig.Default(),
 	})
 	log.Fatalln(loginServer.Listen(ctx, listenAddr))
 }
diff --git a/common/server.go b/common/server.go
@@ -66,9 +66,11 @@ func (b *BaseServer) Listen(logger *log.Entry, addr string, handler BaseHandlerF
 					logger.WithField("error", r).Error("PANIC in connection")
 				}
 				logger.Info("Exiting connection thread.")
+				if err := socket.Close(); err != nil {
+					logger.WithError(err).Warning("error closing socket")
+				}
 			}()
-			err := handler(logger, socket)
-			if err != nil {
+			if err := handler(logger, socket); err != nil {
 				logger.WithError(err).Error("ERROR in connection")
 			}
 		}()