Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement isDraining flag for servers #40

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement isDraining flag for servers #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/api/api0/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,15 @@ func (h *Handler) handleServerUpsert(w http.ResponseWriter, r *http.Request) {
u.MaxPlayers = &x
}
}

if v, err := strconv.ParseBool(q.Get("isDraining")); err == nil {
if canCreate {
s.IsDraining = v
}
if canUpdate {
u.IsDraining = &v
}
}
}

if canCreate {
Expand Down
36 changes: 31 additions & 5 deletions pkg/api/api0/serverlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ type Server struct {
Map string
Playlist string

IsDraining bool

ServerAuthToken string // used for authenticating the masterserver to the gameserver authserver

ModInfo []ServerModInfo
Expand All @@ -118,6 +120,15 @@ func (s Server) AuthAddr() netip.AddrPort {
return netip.AddrPortFrom(s.Addr.Addr(), s.AuthPort)
}

// EffectiveMaxPlayers returns the max players which can actually join, taking
// IsDraining into account.
func (s Server) EffectiveMaxPlayers() int {
if s.IsDraining {
return s.PlayerCount
}
return s.MaxPlayers
}

// clone returns a deep copy of s.
func (s Server) clone() Server {
m := make([]ServerModInfo, len(s.ModInfo))
Expand All @@ -140,6 +151,7 @@ type ServerUpdate struct {
MaxPlayers *int
Map *string
Playlist *string
IsDraining *bool
}

type ServerListLimit struct {
Expand Down Expand Up @@ -338,7 +350,7 @@ func csJSON(ss []*Server, est int, cfg ServerListConfig) ([]byte, int) {
b = append(b, `,"playerCount":`...)
b = strconv.AppendInt(b, int64(srv.PlayerCount), 10)
b = append(b, `,"maxPlayers":`...)
b = strconv.AppendInt(b, int64(srv.MaxPlayers), 10)
b = strconv.AppendInt(b, int64(srv.EffectiveMaxPlayers()), 10)
b = append(b, `,"map":`...)
b = appendJSONString(b, srv.Map)
b = append(b, `,"playlist":`...)
Expand All @@ -348,6 +360,11 @@ func csJSON(ss []*Server, est int, cfg ServerListConfig) ([]byte, int) {
} else {
b = append(b, `,"hasPassword":false`...)
}
if srv.IsDraining {
b = append(b, `,"isDraining":true`...)
} else {
b = append(b, `,"isDraining":false`...)
}
b = append(b, `,"modInfo":{"Mods":[`...)
for j, mi := range srv.ModInfo {
if j != 0 {
Expand Down Expand Up @@ -504,7 +521,7 @@ func (s *ServerList) GetMetrics() []byte {
mpls = append(mpls, mpl{m, nstypes.Playlist("")})
}

var players, maxPlayers, servers, serversWithPlayers, fullServers int
var players, maxPlayers, servers, serversWithPlayers, fullServers, drainingServers int
mplPlayers := make(map[mpl]int, len(mpls))
mplMaxPlayers := make(map[mpl]int, len(mpls))
mplServers := make(map[mpl]int, len(mpls))
Expand All @@ -523,16 +540,19 @@ func (s *ServerList) GetMetrics() []byte {
mplv.Playlist = pl
}
players += srv.PlayerCount
maxPlayers += srv.MaxPlayers
maxPlayers += srv.EffectiveMaxPlayers()
servers++
if srv.PlayerCount > 0 {
serversWithPlayers++
}
if srv.PlayerCount == srv.MaxPlayers {
if srv.PlayerCount == srv.MaxPlayers { // not EffectiveMaxPlayers
fullServers++
}
if srv.IsDraining {
drainingServers++
}
mplPlayers[mplv] += srv.PlayerCount
mplMaxPlayers[mplv] += srv.MaxPlayers
mplMaxPlayers[mplv] += srv.EffectiveMaxPlayers()
mplServers[mplv]++
verServers[srv.LauncherVersion]++
for _, mi := range srv.ModInfo {
Expand Down Expand Up @@ -690,6 +710,9 @@ func (s *ServerList) GetMetrics() []byte {
b.WriteString(`atlas_api0sl_fullservers `)
b.WriteString(strconv.Itoa(fullServers))
b.WriteByte('\n')
b.WriteString(`atlas_api0sl_drainingservers `)
b.WriteString(strconv.Itoa(drainingServers))
b.WriteByte('\n')

return b.Bytes()
}
Expand Down Expand Up @@ -881,6 +904,9 @@ func (s *ServerList) ServerHybridUpdatePut(u *ServerUpdate, c *Server, l ServerL
if u.MaxPlayers != nil {
esrv.MaxPlayers, changed = *u.MaxPlayers, true
}
if u.IsDraining != nil {
esrv.IsDraining, changed = *u.IsDraining, true
}
if changed {
s.csForceUpdate()
}
Expand Down