Added logger singleton

server/channelserver/handlers_cast_binary.go

@@ -7,9 +7,12 @@ import (
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/logger"
 	"erupe-ce/utils/mhfcid"
 	"erupe-ce/utils/mhfcourse"
 	"erupe-ce/utils/token"
+	"sync"
+
 	"fmt"
 	"math"
 	"strconv"
@@ -39,24 +42,27 @@ const (
 	BroadcastTypeWorld    = 0x0a
 )
 
-var commands map[string]_config.Command
+var (
+	commands   map[string]_config.Command
+	once       sync.Once  // Ensures that initialization happens only once
+	commandsMu sync.Mutex // Mutex to ensure thread safety for commands map
+)
 
-func init() {
-	commands = make(map[string]_config.Command)
-	zapConfig := zap.NewDevelopmentConfig()
-	zapConfig.DisableCaller = true
-	zapLogger, _ := zapConfig.Build()
-	defer zapLogger.Sync()
-	logger := zapLogger.Named("commands")
-	cmds := _config.ErupeConfig.Commands
-	for _, cmd := range cmds {
-		commands[cmd.Name] = cmd
-		if cmd.Enabled {
-			logger.Info(fmt.Sprintf("Command %s: Enabled, prefix: %s", cmd.Name, cmd.Prefix))
-		} else {
-			logger.Info(fmt.Sprintf("Command %s: Disabled", cmd.Name))
+func (server *Server) initCommands() {
+	once.Do(func() {
+		commands = make(map[string]_config.Command)
+
+		commandLogger := logger.Get().Named("command")
+		cmds := _config.ErupeConfig.Commands
+		for _, cmd := range cmds {
+			commands[cmd.Name] = cmd
+			if cmd.Enabled {
+				commandLogger.Info(fmt.Sprintf("%s: Enabled, prefix: %s", cmd.Name, cmd.Prefix))
+			} else {
+				commandLogger.Info(fmt.Sprintf("%s: Disabled", cmd.Name))
+			}
 		}
-	}
+	})
 }
 
 func sendDisabledCommandMessage(s *Session, cmd _config.Command) {

server/channelserver/sys_channel_server.go

@@ -9,6 +9,7 @@ import (
 	_config "erupe-ce/config"
 	"erupe-ce/server/discordbot"
 	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/logger"
 
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
@@ -17,7 +18,6 @@ import (
 // Config struct allows configuring the server.
 type Config struct {
 	ID          uint16
-	Logger      *zap.Logger
 	DB          *sqlx.DB
 	DiscordBot  *discordbot.DiscordBot
 	ErupeConfig *_config.Config
@@ -39,7 +39,7 @@ type Server struct {
 	GlobalID       string
 	IP             string
 	Port           uint16
-	logger         *zap.Logger
+	logger         logger.Logger
 	db             *sqlx.DB
 	erupeConfig    *_config.Config
 	acceptConns    chan net.Conn
@@ -92,7 +92,7 @@ func NewServer(config *Config) *Server {
 	}
 	server := &Server{
 		ID:              config.ID,
-		logger:          config.Logger,
+		logger:          logger.Get().Named("channel-" + fmt.Sprint(config.ID)),
 		db:              config.DB,
 		erupeConfig:     config.ErupeConfig,
 		acceptConns:     make(chan net.Conn),
@@ -114,9 +114,9 @@ func NewServer(config *Config) *Server {
 		questCacheData: make(map[int][]byte),
 		questCacheTime: make(map[int]time.Time),
 	}
+	server.initCommands()
 
 	server.i18n = getLangStrings(server)
-
 	return server
 }
 

server/channelserver/sys_session.go

@@ -15,6 +15,7 @@ import (
 	"erupe-ce/network"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/logger"
 	"erupe-ce/utils/stringstack"
 
 	"go.uber.org/zap"
@@ -23,7 +24,7 @@ import (
 // Session holds state for the channel server connection.
 type Session struct {
 	sync.Mutex
-	logger      *zap.Logger
+	logger      logger.Logger
 	server      *Server
 	rawConn     net.Conn
 	cryptConn   *network.CryptConn