Skip to content

wsnet2-tool: server/hubのheartbeatがnullの場合動かなかったのを修正 #99

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

Merged
makiuchi-d merged 1 commit into from
Jul 15, 2026
+10 −9
Merged

wsnet2-tool: server/hubのheartbeatがnullの場合動かなかったのを修正 #99

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
19 changes: 10 additions & 9 deletions server/cmd/wsnet2-tool/cmd/servers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cmd

import (
"database/sql"
"os"
"time"

Expand All @@ -16,13 +17,13 @@ var (
)

type server struct {
Id int `db:"id"`
HostName string `db:"hostname"`
PublicName string `db:"public_name"`
GRPCPort int `db:"grpc_port"`
WebSocketPort int `db:"ws_port"`
Status int `db:"status"`
HeartBeat int64 `db:"heartbeat"`
Id int `db:"id"`
HostName string `db:"hostname"`
PublicName string `db:"public_name"`
GRPCPort int `db:"grpc_port"`
WebSocketPort int `db:"ws_port"`
Status int `db:"status"`
HeartBeat sql.Null[int64] `db:"heartbeat"`
}

// serversCmd represents the servers command
Expand Down Expand Up @@ -77,7 +78,7 @@ func printServersHeader(cmd *cobra.Command) {

func printServer(cmd *cobra.Command, typ string, s server) {
st := serverStatusStr[s.Status]
hb := time.Unix(s.HeartBeat, 0)
hb := time.Unix(s.HeartBeat.V, 0)
ok := "Available"
if !s.Available() {
if !serversAll {
Expand All @@ -92,5 +93,5 @@ func printServer(cmd *cobra.Command, typ string, s server) {

func (s *server) Available() bool {
v := time.Now().Add(-time.Duration(conf.Lobby.ValidHeartBeat)).Unix()
return v < s.HeartBeat
return v < s.HeartBeat.V
}
Loading