mirror of
https://github.com/Mezeporta/Erupe.git
synced 2025-12-22 03:45:24 +01:00
mezfes patch
This commit is contained in:
@@ -108,7 +108,7 @@ func main() {
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start launcher server", zap.Error(err))
|
||||
}
|
||||
logger.Info("Started launcher server.")
|
||||
logger.Info("Started launcher server")
|
||||
|
||||
// Entrance server.
|
||||
entranceServer := entranceserver.NewServer(
|
||||
@@ -121,7 +121,7 @@ func main() {
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start entrance server", zap.Error(err))
|
||||
}
|
||||
logger.Info("Started entrance server.")
|
||||
logger.Info("Started entrance server")
|
||||
|
||||
// Sign server.
|
||||
signServer := signserver.NewServer(
|
||||
@@ -134,79 +134,39 @@ func main() {
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start sign server", zap.Error(err))
|
||||
}
|
||||
logger.Info("Started sign server.")
|
||||
logger.Info("Started sign server")
|
||||
|
||||
// Channel Server
|
||||
channelServer1 := channelserver.NewServer(
|
||||
&channelserver.Config{
|
||||
Logger: logger.Named("channel"),
|
||||
ErupeConfig: erupeConfig,
|
||||
DB: db,
|
||||
Name: erupeConfig.Entrance.Entries[0].Name,
|
||||
Enable: erupeConfig.Entrance.Entries[0].Channels[0].MaxPlayers > 0,
|
||||
//DiscordBot: discordBot,
|
||||
})
|
||||
|
||||
err = channelServer1.Start(erupeConfig.Channel.Port1)
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start channel server1", zap.Error(err))
|
||||
var channels []channelserver.Server
|
||||
count := 1
|
||||
for _, ee := range erupeConfig.Entrance.Entries {
|
||||
for _, ce := range ee.Channels {
|
||||
c := *channelserver.NewServer(&channelserver.Config{
|
||||
Logger: logger.Named("channel-"+fmt.Sprint(count)),
|
||||
ErupeConfig: erupeConfig,
|
||||
DB: db,
|
||||
DiscordBot: discordBot,
|
||||
})
|
||||
err = c.Start(int(ce.Port))
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start channel", zap.Error(err))
|
||||
} else {
|
||||
logger.Info(fmt.Sprintf("Started channel server %d on port %d", count, ce.Port))
|
||||
}
|
||||
channels = append(channels, c)
|
||||
count++
|
||||
}
|
||||
}
|
||||
logger.Info("Started channel server.")
|
||||
// Channel Server
|
||||
channelServer2 := channelserver.NewServer(
|
||||
&channelserver.Config{
|
||||
Logger: logger.Named("channel"),
|
||||
ErupeConfig: erupeConfig,
|
||||
DB: db,
|
||||
Name: erupeConfig.Entrance.Entries[1].Name,
|
||||
Enable: erupeConfig.Entrance.Entries[1].Channels[0].MaxPlayers > 0,
|
||||
DiscordBot: discordBot,
|
||||
})
|
||||
|
||||
err = channelServer2.Start(erupeConfig.Channel.Port2)
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start channel server2", zap.Error(err))
|
||||
}
|
||||
// Channel Server
|
||||
channelServer3 := channelserver.NewServer(
|
||||
&channelserver.Config{
|
||||
Logger: logger.Named("channel"),
|
||||
ErupeConfig: erupeConfig,
|
||||
DB: db,
|
||||
Name: erupeConfig.Entrance.Entries[2].Name,
|
||||
Enable: erupeConfig.Entrance.Entries[2].Channels[0].MaxPlayers > 0,
|
||||
//DiscordBot: discordBot,
|
||||
})
|
||||
|
||||
err = channelServer3.Start(erupeConfig.Channel.Port3)
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start channel server3", zap.Error(err))
|
||||
}
|
||||
// Channel Server
|
||||
channelServer4 := channelserver.NewServer(
|
||||
&channelserver.Config{
|
||||
Logger: logger.Named("channel"),
|
||||
ErupeConfig: erupeConfig,
|
||||
DB: db,
|
||||
Name: erupeConfig.Entrance.Entries[3].Name,
|
||||
Enable: erupeConfig.Entrance.Entries[3].Channels[0].MaxPlayers > 0,
|
||||
//DiscordBot: discordBot,
|
||||
})
|
||||
|
||||
err = channelServer4.Start(erupeConfig.Channel.Port4)
|
||||
if err != nil {
|
||||
logger.Fatal("Failed to start channel server4", zap.Error(err))
|
||||
}
|
||||
// Wait for exit or interrupt with ctrl+C.
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
||||
<-c
|
||||
|
||||
logger.Info("Trying to shutdown gracefully.")
|
||||
channelServer4.Shutdown()
|
||||
channelServer3.Shutdown()
|
||||
channelServer2.Shutdown()
|
||||
channelServer1.Shutdown()
|
||||
logger.Info("Trying to shutdown gracefully")
|
||||
|
||||
for _, c := range channels {
|
||||
c.Shutdown()
|
||||
}
|
||||
signServer.Shutdown()
|
||||
entranceServer.Shutdown()
|
||||
launcherServer.Shutdown()
|
||||
|
||||
Reference in New Issue
Block a user