laneya2

commit

4d3a476f5da975721b5cb26bc919608e77a2c535

parent

a9a153f24a7c8b3bcfd51fc5ab4e30c2c2510465

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2024-09-22 04:27

more consistent logging

Diffstat

3 files changed, 28 insertions, 4 deletions

diff --git a/game.go b/game.go

@@ -46,6 +46,9 @@ func getGame(id string) *Game {
   46    46 	mux.RUnlock()
   47    47 
   48    48 	if !ok {
   -1    49 		if verbose {
   -1    50 			log.Println("create game", id)
   -1    51 		}
   49    52 		game = &Game{
   50    53 			Id:         id,
   51    54 			Players:    make(map[*Player]bool),
@@ -145,6 +148,9 @@ func (game *Game) run() {
  145   148 	for {
  146   149 		select {
  147   150 		case player := <-game.register:
   -1   151 			if verbose {
   -1   152 				log.Println("create player", game.Id, player.Id)
   -1   153 			}
  148   154 			setup := []Message{
  149   155 				Message{
  150   156 					"action": "setId",
@@ -177,8 +183,14 @@ func (game *Game) run() {
  177   183 				},
  178   184 			})
  179   185 		case player := <-game.unregister:
   -1   186 			if verbose {
   -1   187 				log.Println("remove player", game.Id, player.Id)
   -1   188 			}
  180   189 			delete(game.Players, player)
  181   190 			if len(game.Players) == 0 {
   -1   191 				if verbose {
   -1   192 					log.Println("remove game", game.Id)
   -1   193 				}
  182   194 				mux.Lock()
  183   195 				delete(games, game.Id)
  184   196 				mux.Unlock()
@@ -217,8 +229,8 @@ func (game *Game) run() {
  217   229 
  218   230 					game.MaybeNextLevel()
  219   231 				}
  220    -1 			} else {
  221    -1 				log.Println(msg)
   -1   232 			} else if verbose {
   -1   233 				log.Println("unknown action", msg)
  222   234 			}
  223   235 		}
  224   236 	}

diff --git a/server.go b/server.go

@@ -27,6 +27,9 @@ func (player *Player) readPump() {
   27    27 		msg := Message{}
   28    28 		err := player.conn.ReadJSON(&msg)
   29    29 		if err != nil {
   -1    30 			if verbose {
   -1    31 				log.Println(err)
   -1    32 			}
   30    33 			return
   31    34 		}
   32    35 		player.Game.Msg <- PlayerMessage{player, msg}
@@ -43,6 +46,9 @@ func (player *Player) writePump() {
   43    46 		case data := <-player.Send:
   44    47 			err := player.conn.WriteJSON(data)
   45    48 			if err != nil {
   -1    49 				if verbose {
   -1    50 					log.Println(err)
   -1    51 				}
   46    52 				return
   47    53 			}
   48    54 		case <-ticker.C:
@@ -52,6 +58,9 @@ func (player *Player) writePump() {
   52    58 			player.alive = false
   53    59 			err := player.conn.WriteMessage(websocket.PingMessage, nil)
   54    60 			if err != nil {
   -1    61 				if verbose {
   -1    62 					log.Println(err)
   -1    63 				}
   55    64 				return
   56    65 			}
   57    66 		}
@@ -61,7 +70,9 @@ func (player *Player) writePump() {
   61    70 func serveWs(w http.ResponseWriter, r *http.Request) {
   62    71 	conn, err := upgrader.Upgrade(w, r, nil)
   63    72 	if err != nil {
   64    -1 		log.Println(err)
   -1    73 		if verbose {
   -1    74 			log.Println(err)
   -1    75 		}
   65    76 		return
   66    77 	}
   67    78 

diff --git a/static/main.js b/static/main.js

@@ -122,7 +122,6 @@ socket.onclose = function() {
  122   122 socket.onmessage = function(event) {
  123   123     var messages = JSON.parse(event.data);
  124   124     for (const msg of messages) {
  125    -1         console.log(msg);
  126   125         if (msg.action === 'setId') {
  127   126             game.id = msg.id;
  128   127         } else if (msg.action === 'setLevel') {
@@ -146,6 +145,8 @@ socket.onmessage = function(event) {
  146   145             }
  147   146         } else if (msg.action === 'remove') {
  148   147             delete game.objects[msg.id];
   -1   148         } else {
   -1   149             console.log(msg);
  149   150         }
  150   151     }
  151   152     render();