From eb2a85399b3fcdb7282cdece6becc231667583d5 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Thu, 7 Jan 2021 16:15:43 -0700 Subject: [PATCH] Update logs / add an error log on 500 errors. --- server/src/events/CreateGame.ts | 1 + server/src/events/DeleteGame.ts | 1 + server/src/events/GetHand.ts | 1 + server/src/events/GetPastQuestions.ts | 1 + server/src/events/JoinGame.ts | 1 + server/src/events/LeaveGame.ts | 1 + server/src/events/NewHand.ts | 1 + server/src/events/ObjectList.ts | 5 +++-- server/src/events/SelectObject.ts | 1 + server/src/events/SendCard.ts | 3 ++- server/src/events/StartGame.ts | 3 ++- server/src/events/UpdateAnswer.ts | 1 + server/src/events/UpdatePlayer.ts | 1 + 13 files changed, 17 insertions(+), 4 deletions(-) diff --git a/server/src/events/CreateGame.ts b/server/src/events/CreateGame.ts index 3a2ee3d..bd52466 100644 --- a/server/src/events/CreateGame.ts +++ b/server/src/events/CreateGame.ts @@ -28,6 +28,7 @@ export default (io: Server, socket: Socket, data: CreateGame) => { routineCheck(); } catch (err) { + log.prettyError(err); socket.emit(`GameCreated`, { status: 500, message: err.message, diff --git a/server/src/events/DeleteGame.ts b/server/src/events/DeleteGame.ts index 87bd33a..00b1624 100644 --- a/server/src/events/DeleteGame.ts +++ b/server/src/events/DeleteGame.ts @@ -39,6 +39,7 @@ export default (io: Server, socket: Socket, data: DeleteGame) => { }); } catch (err) { + log.prettyError(err); socket.emit(`GameDeleted`, { status: 500, message: err.message, diff --git a/server/src/events/GetHand.ts b/server/src/events/GetHand.ts index 4eb1ca7..9e39a8e 100644 --- a/server/src/events/GetHand.ts +++ b/server/src/events/GetHand.ts @@ -23,6 +23,7 @@ export default (io: Server, socket: Socket, data: GetHand) => { }); } catch (err) { + log.prettyError(err); socket.emit(`QuestionList`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/GetPastQuestions.ts b/server/src/events/GetPastQuestions.ts index 8a7100d..c9d7f60 100644 --- a/server/src/events/GetPastQuestions.ts +++ b/server/src/events/GetPastQuestions.ts @@ -24,6 +24,7 @@ export default (io: Server, socket: Socket, data: GetPastQuestions) => { }); } catch (err) { + log.prettyError(err); socket.emit(`PastQuestions`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/JoinGame.ts b/server/src/events/JoinGame.ts index 80fd70d..27a76be 100644 --- a/server/src/events/JoinGame.ts +++ b/server/src/events/JoinGame.ts @@ -166,6 +166,7 @@ export default (io: Server, socket: Socket, data: JoinGame) => { }); } catch (err) { + log.prettyError(err); socket.emit(`GameJoined`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/LeaveGame.ts b/server/src/events/LeaveGame.ts index 43725e6..e01a0f2 100644 --- a/server/src/events/LeaveGame.ts +++ b/server/src/events/LeaveGame.ts @@ -64,6 +64,7 @@ export default (io: Server, socket: Socket, data: LeaveGame) => { }; } catch (err) { + log.prettyError(err); socket.emit(`GameLeft`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/NewHand.ts b/server/src/events/NewHand.ts index cd41e3d..7acb880 100644 --- a/server/src/events/NewHand.ts +++ b/server/src/events/NewHand.ts @@ -43,6 +43,7 @@ export default (io: Server, socket: Socket, data: NewHand) => { }); } catch (err) { + log.prettyError(err); socket.emit(`UpdateHand`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/ObjectList.ts b/server/src/events/ObjectList.ts index 04f6cfe..11a08e6 100644 --- a/server/src/events/ObjectList.ts +++ b/server/src/events/ObjectList.ts @@ -7,7 +7,7 @@ export default (io: Server, socket: Socket, data: ObjectList) => { // Assert game exists if (!games[data.game_code]) { log.debug(`Can't get objects for game that doesn't exist: ${data.game_code}`); - socket.emit(`Error`, { + socket.emit(`ObjectList`, { status: 404, message: `Game with code ${data.game_code} could not be found`, source: `ObjectList` @@ -22,7 +22,8 @@ export default (io: Server, socket: Socket, data: ObjectList) => { }); } catch (err) { - socket.emit(`Error`, { + log.prettyError(err); + socket.emit(`ObjectList`, { status: 500, message: `${err.name}: ${err.message}`, source: `ObjectList`, diff --git a/server/src/events/SelectObject.ts b/server/src/events/SelectObject.ts index 521522d..d50faf2 100644 --- a/server/src/events/SelectObject.ts +++ b/server/src/events/SelectObject.ts @@ -35,6 +35,7 @@ export default (io: Server, socket: Socket, data: SelectObject) => { }); } catch (err) { + log.prettyError(err); socket.emit(`ChosenObject`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/SendCard.ts b/server/src/events/SendCard.ts index 97b5aa8..67aae24 100644 --- a/server/src/events/SendCard.ts +++ b/server/src/events/SendCard.ts @@ -42,7 +42,7 @@ export default (io: Server, socket: Socket, data: SendCard) => { // The writer is sending the card to the writer else if (data.from === "guesser") { - game.log.debug(`Guesser is sending the card to the writer.`); + game.log.debug(`Guesser is sending a card to the writer.`); // Update the team's hand team.removeCard(data.text); @@ -74,6 +74,7 @@ export default (io: Server, socket: Socket, data: SendCard) => { }; } catch (err) { + log.prettyError(err); socket.emit(`UpdateHand`, { status: 500, message: err.message, diff --git a/server/src/events/StartGame.ts b/server/src/events/StartGame.ts index 719037b..14580e9 100644 --- a/server/src/events/StartGame.ts +++ b/server/src/events/StartGame.ts @@ -7,7 +7,7 @@ export default (io: Server, socket: Socket, data: StartGame) => { // Assert game exists if (!games[data.game_code]) { log.debug(`Could not find a game with ID ${data.game_code} to start`); - socket.emit(`GameJoined`, { + socket.emit(`GameStarted`, { status: 404, message: `Game with code "${data.game_code}" could not be found`, source: `StartGame`, @@ -65,6 +65,7 @@ export default (io: Server, socket: Socket, data: StartGame) => { io.to(game.id).emit(`GameStarted`, { status: 200 }); } catch (err) { + log.prettyError(err); socket.emit(`GameStarted`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/UpdateAnswer.ts b/server/src/events/UpdateAnswer.ts index 0821170..ee7c2c8 100644 --- a/server/src/events/UpdateAnswer.ts +++ b/server/src/events/UpdateAnswer.ts @@ -26,6 +26,7 @@ export default (io: Server, socket: Socket, data: UpdateAnswer) => { }); } catch (err) { + log.prettyError(err); socket.emit(`UpdateAnswer`, { status: 500, message: `${err.name}: ${err.message}`, diff --git a/server/src/events/UpdatePlayer.ts b/server/src/events/UpdatePlayer.ts index af1de08..f2dff42 100644 --- a/server/src/events/UpdatePlayer.ts +++ b/server/src/events/UpdatePlayer.ts @@ -32,6 +32,7 @@ export default (io: Server, socket: Socket, data: UpdatePlayer) => { }; } catch (err) { + log.prettyError(err); socket.emit(`PlayerUpdate`, { status: 500, message: `${err.name}: ${err.message}`,