grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change connection handler to prependListener, add more trace logging

This commit is contained in:
Michael Lumish 2025-02-13 10:55:12 -08:00
parent 6e901c1511
commit bb6fff7ff5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grpc-js/src/server.ts
View File

@ -576,9 +576,11 @@ export class Server {
enableTrace: this.options['grpc-node.tls_enable_trace'] === 1
};
let areCredentialsValid = credentialsSettings !== null;
this.trace('Initial credentials valid: ' + areCredentialsValid);
http2Server = http2.createSecureServer(secureServerOptions);
http2Server.on('connection', (socket: Socket) => {
http2Server.prependListener('connection', (socket: Socket) => {
if (!areCredentialsValid) {
this.trace('Dropped connection from ' + JSON.stringify(socket.address()) + ' due to unloaded credentials');
socket.destroy();
}
});
@ -596,6 +598,7 @@ export class Server {
(http2Server as http2.Http2SecureServer).setSecureContext(options);
}
areCredentialsValid = options !== null;
this.trace('Post-update credentials valid: ' + areCredentialsValid);
}
credentials._addWatcher(credsWatcher);
http2Server.on('close', () => {

2
packages/grpc-js/src/transport.ts
View File

@ -738,7 +738,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
}
let tcpConnection: net.Socket | null = null;
let secureConnectResult: SecureConnectResult | null = null;
const addressString = this.trace(subchannelAddressToString(address));
const addressString = subchannelAddressToString(address);
try {
tcpConnection = await this.tcpConnect(address, options);
this.trace(addressString + ' ' + 'Established TCP connection');