Skip to content

Commit 8f49ea8

Browse files
committed
chore: access ctx.clientAddress for trace logs where available
1 parent 6a2b198 commit 8f49ea8

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

packages/grpc-js/src/server.ts

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,8 +1521,7 @@ export class Server {
15211521
ctx.sessionClosedByServer = true;
15221522

15231523
server.trace(
1524-
'Connection dropped by max connection age: ' +
1525-
session.socket?.remoteAddress
1524+
'Connection dropped by max connection age: ' + ctx.clientAddress
15261525
);
15271526

15281527
try {
@@ -1612,7 +1611,8 @@ export class Server {
16121611
this.onIdleTimeout,
16131612
this.sessionIdleTimeout,
16141613
this,
1615-
session
1614+
session,
1615+
ctx
16161616
);
16171617
const idleTimeoutObj: SessionIdleTimeoutTracker = {
16181618
activeStreams: 0,
@@ -1625,19 +1625,14 @@ export class Server {
16251625

16261626
this.sessionIdleTimeouts.set(session, idleTimeoutObj);
16271627

1628-
const { socket } = session;
1629-
this.trace(
1630-
'Enable idle timeout for ' +
1631-
socket.remoteAddress +
1632-
':' +
1633-
socket.remotePort
1634-
);
1628+
this.trace('Enable idle timeout for ' + ctx.clientAddress);
16351629
}
16361630

16371631
private onIdleTimeout(
1638-
this: undefined,
1632+
this: unknown,
16391633
server: Server,
1640-
session: http2.ServerHttp2Session
1634+
session: http2.ServerHttp2Session,
1635+
ctx: SessionCtx
16411636
) {
16421637
const sessionInfo = server.sessionIdleTimeouts.get(session);
16431638

@@ -1650,14 +1645,7 @@ export class Server {
16501645
sessionInfo.activeStreams === 0 &&
16511646
Date.now() - sessionInfo.lastIdle >= server.sessionIdleTimeout
16521647
) {
1653-
const { socket } = session;
1654-
server.trace(
1655-
'Session idle timeout triggered for ' +
1656-
socket?.remoteAddress +
1657-
':' +
1658-
socket?.remotePort
1659-
);
1660-
1648+
server.trace('Session idle timeout triggered for ' + ctx.clientAddress);
16611649
server.closeSession(session);
16621650
}
16631651
}

0 commit comments

Comments
 (0)