Skip to content

Commit 3dcee81

Browse files
committed
chore: log warning in ws connection was not closed cleanly (#858)
1 parent 41e080c commit 3dcee81

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

packages/actor-core/src/actor/router.ts

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,23 @@ export function createActorRouter(
169169
ws.close(1011, code);
170170
}
171171
},
172-
onClose: async (_evt) => {
172+
onClose: async (event) => {
173173
try {
174174
await onOpenPromise;
175175

176-
logger().debug("websocket closed");
176+
if (event.wasClean) {
177+
logger().info("websocket closed", {
178+
code: event.code,
179+
reason: event.reason,
180+
wasClean: event.wasClean,
181+
});
182+
} else {
183+
logger().warn("websocket closed", {
184+
code: event.code,
185+
reason: event.reason,
186+
wasClean: event.wasClean,
187+
});
188+
}
177189

178190
await wsHandler.onClose();
179191
} catch (error) {
@@ -186,9 +198,7 @@ export function createActorRouter(
186198

187199
// Actors don't need to know about this, since it's abstracted
188200
// away
189-
logger().warn("websocket error", {
190-
error: stringifyError(error),
191-
});
201+
logger().warn("websocket error");
192202
} catch (error) {
193203
deconstructError(error, logger(), { wsEvent: "error" });
194204
}

packages/actor-core/src/client/handle.ts

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,20 @@ enc
382382
//
383383
// These properties will be undefined
384384
const closeEvent = event as CloseEvent;
385-
logger().debug("socket closed", {
386-
code: closeEvent.code,
387-
reason: closeEvent.reason,
388-
wasClean: closeEvent.wasClean,
389-
});
385+
console.log('close event', JSON.stringify(event));
386+
if (closeEvent.wasClean) {
387+
logger().info("socket closed", {
388+
code: closeEvent.code,
389+
reason: closeEvent.reason,
390+
wasClean: closeEvent.wasClean,
391+
});
392+
} else {
393+
logger().warn("socket closed", {
394+
code: closeEvent.code,
395+
reason: closeEvent.reason,
396+
wasClean: closeEvent.wasClean,
397+
});
398+
}
390399

391400
this.#transport = undefined;
392401

@@ -404,6 +413,8 @@ enc
404413
/** Called by the onerror event from drivers. */
405414
#handleOnError(event: Event) {
406415
if (this.#disposed) return;
416+
417+
// More detailed information will be logged in onclose
407418
logger().warn("socket error", { event });
408419
}
409420

0 commit comments

Comments
 (0)