Skip to content

Commit bc69189

Browse files
committed
lint errors
1 parent e6a4c95 commit bc69189

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

simple-game-server-go/internal/game/allocated.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func (g *Game) allocated(allocationID string) {
2828
c := g.Config()
2929
port, _ := c.Port.Int64()
3030
maxPlayers, _ := strconv.ParseInt(c.Extra["maxPlayers"], 10, 32)
31+
3132
if maxPlayers == 0 {
3233
maxPlayers = defaultMaxPlayers
3334
}
@@ -52,12 +53,14 @@ func (g *Game) allocated(allocationID string) {
5253
func (g *Game) launchGame(port int64) {
5354
g.logger.Info("allocated")
5455
addr, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf(":%d", port))
56+
5557
if err != nil {
5658
g.logger.WithError(err).Error("error resolving TCP address")
5759
return
5860
}
5961

6062
gs, err := net.ListenTCP("tcp4", addr)
63+
6164
if err != nil {
6265
g.logger.WithError(err).Error("error listening on TCP port")
6366
return
@@ -69,6 +72,7 @@ func (g *Game) launchGame(port int64) {
6972

7073
for {
7174
client, err := g.acceptClient(g.gameBind)
75+
7276
if err != nil {
7377
if errors.Is(err, syscall.EINVAL) {
7478
g.logger.Debug("server closed")
@@ -86,6 +90,7 @@ func (g *Game) launchGame(port int64) {
8690
// acceptClient accepts a new TCP connection and updates internal state.
8791
func (g *Game) acceptClient(server *net.TCPListener) (*net.TCPConn, error) {
8892
client, err := server.AcceptTCP()
93+
8994
if err != nil {
9095
return nil, err
9196
}
@@ -114,8 +119,10 @@ func (g *Game) handleClient(client *net.TCPConn) {
114119
"current_players": currentPlayers,
115120
}).Info("client disconnected")
116121
}()
122+
117123
for {
118124
buf := make([]byte, 16)
125+
119126
if _, err := client.Read(buf); err != nil {
120127
return
121128
}
@@ -143,6 +150,7 @@ func (g *Game) readyForPlayers() {
143150

144151
if g.Config().Extra["readyTimeout"] != "" {
145152
t, err := time.ParseDuration(g.Config().Extra["readyTimeout"])
153+
146154
if err != nil {
147155
g.logger.WithError(err).Error("parsing ready timeout")
148156
} else {

simple-game-server-go/main.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func parseFlags(args []string) (string, string, string, error) {
3434
// If no valid targets are provided, it defaults to writing to stdout.
3535
func logWritersFromTargets(logTargets string, logFile string, logger *logrus.Logger) io.Writer {
3636
targets := make([]io.Writer, 0)
37+
3738
for _, t := range splitAndTrim(logTargets) {
3839
switch t {
3940
case "stdout":
@@ -54,6 +55,7 @@ func logWritersFromTargets(logTargets string, logFile string, logger *logrus.Log
5455
targets = append(targets, f)
5556
}
5657
}
58+
5759
// logFile takes precedence
5860
if logFile != "" {
5961
f, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o666)
@@ -63,6 +65,7 @@ func logWritersFromTargets(logTargets string, logFile string, logger *logrus.Log
6365
logger.WithError(err).Warning("could not open log file for writing")
6466
}
6567
}
68+
6669
if len(targets) == 0 {
6770
return os.Stdout
6871
}
@@ -72,6 +75,7 @@ func logWritersFromTargets(logTargets string, logFile string, logger *logrus.Log
7275
// splitAndTrim splits a string by the OS-specific path list separator and trims each part.
7376
func splitAndTrim(s string) []string {
7477
parts := make([]string, 0)
78+
7579
for _, p := range filepath.SplitList(s) {
7680
for _, t := range splitComma(p) {
7781
trimmed := filepath.Clean(t)
@@ -86,6 +90,7 @@ func splitAndTrim(s string) []string {
8690
// splitComma splits a string by commas and trims each part, returning a slice of non-empty strings.
8791
func splitComma(s string) []string {
8892
res := make([]string, 0)
93+
8994
for _, t := range strings.Split(s, ",") {
9095
trimmed := strings.TrimSpace(t)
9196
if trimmed != "" && trimmed != "." {
@@ -100,6 +105,7 @@ func main() {
100105
logger.SetFormatter(&logrus.JSONFormatter{})
101106

102107
logTargets, logFile, tracebackLevel, err := parseFlags(os.Args[1:])
108+
103109
if err != nil {
104110
logger.WithError(err).Fatal("error parsing flags")
105111
}
@@ -112,6 +118,7 @@ func main() {
112118
logger.Out = logWritersFromTargets(logTargets, logFile, logger)
113119

114120
g, err := game.New(logger)
121+
115122
if err != nil {
116123
logger.WithError(err).Fatal("error creating game handler")
117124
}

0 commit comments

Comments
 (0)