Просмотр исходного кода

use separate session manager for chat

Mike 2 лет назад
Родитель
Сommit
944cb569f4
4 измененных файлов с 7 добавлено и 6 удалено
  1. 1 0
      cmd/server/main.go
  2. 2 2
      server/oscar/auth.go
  3. 2 2
      server/oscar/bos.go
  4. 2 2
      server/oscar/chat.go

+ 1 - 0
cmd/server/main.go

@@ -86,6 +86,7 @@ func main() {
 	}(logger)
 	go func(logger *slog.Logger) {
 		logger = logger.With("svc", "CHAT")
+		sessionManager := state.NewInMemorySessionManager(logger)
 		buddyService := foodgroup.NewBuddyService(nil, feedbagStore, adjListBuddyListStore)
 		authService := foodgroup.NewAuthService(cfg, sessionManager, feedbagStore, chatRegistry, adjListBuddyListStore, cookieBaker, buddyService)
 		chatService := foodgroup.NewChatService(chatRegistry)

+ 2 - 2
server/oscar/auth.go

@@ -38,12 +38,12 @@ func (rt AuthServer) Start() {
 	addr := net.JoinHostPort("", rt.Config.AuthPort)
 	listener, err := net.Listen("tcp", addr)
 	if err != nil {
-		rt.Logger.Error("unable to bind auth server address", "err", err.Error())
+		rt.Logger.Error("unable to bind server address", "host", addr, "err", err.Error())
 		os.Exit(1)
 	}
 	defer listener.Close()
 
-	rt.Logger.Info("starting auth service", "host", net.JoinHostPort(rt.Config.OSCARHost, rt.Config.AuthPort))
+	rt.Logger.Info("starting server", "listen_host", addr, "oscar_host", rt.Config.OSCARHost)
 
 	for {
 		conn, err := listener.Accept()

+ 2 - 2
server/oscar/bos.go

@@ -37,12 +37,12 @@ type BOSServer struct {
 func (rt BOSServer) Start() {
 	listener, err := net.Listen("tcp", rt.ListenAddr)
 	if err != nil {
-		rt.Logger.Error("unable to bind BOS server address", "err", err.Error())
+		rt.Logger.Error("unable to bind server address", "host", rt.ListenAddr, "err", err.Error())
 		os.Exit(1)
 	}
 	defer listener.Close()
 
-	rt.Logger.Info("starting service", "host", rt.ListenAddr)
+	rt.Logger.Info("starting server", "listen_host", rt.ListenAddr, "oscar_host", rt.Config.OSCARHost)
 
 	for {
 		conn, err := listener.Accept()

+ 2 - 2
server/oscar/chat.go

@@ -29,12 +29,12 @@ func (rt ChatServer) Start() {
 	addr := net.JoinHostPort("", rt.Config.ChatPort)
 	listener, err := net.Listen("tcp", addr)
 	if err != nil {
-		rt.Logger.Error("unable to bind chat server address", "err", err.Error())
+		rt.Logger.Error("unable to bind server address", "host", addr, "err", err.Error())
 		os.Exit(1)
 	}
 	defer listener.Close()
 
-	rt.Logger.Info("starting chat service", "host", net.JoinHostPort(rt.Config.OSCARHost, rt.Config.ChatPort))
+	rt.Logger.Info("starting server", "listen_host", addr, "oscar_host", rt.Config.OSCARHost)
 
 	for {
 		conn, err := listener.Accept()