Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc/grpc-node
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @grpc/grpc-js@1.9.7
Choose a base ref
...
head repository: grpc/grpc-node
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b75a8c98d74a86dcd238027af582caf57effa0f4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 27, 2023

  1. grpc-js: Cancel and don't start idle timer on shutdown

    @murgatroid99
    murgatroid99 committed Oct 27, 2023
    Copy the full SHA
    446f139 View commit details

  2. Merge pull request #2606 from murgatroid99/grpc-js_idle_timer_shutdown 

    grpc-js: Cancel and don't start idle timer on shutdown
    @murgatroid99
    murgatroid99 authored Oct 27, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    targos Michaël Zasso
    GPG key ID: 770F7A9A5AE15600
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b75a8c9 View commit details
Showing with 5 additions and 2 deletions.
  1. +1 −1 packages/grpc-js/package.json
  2. +4 −1 packages/grpc-js/src/internal-channel.ts
2 changes: 1 addition & 1 deletion packages/grpc-js/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@grpc/grpc-js",
"version": "1.9.7",
"version": "1.9.8",
"description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
5 changes: 4 additions & 1 deletion packages/grpc-js/src/internal-channel.ts
View file
Original file line number Diff line number Diff line change
@@ -554,7 +554,7 @@ export class InternalChannel {
}

private maybeStartIdleTimer() {
if (this.callCount === 0) {
if (this.connectivityState !== ConnectivityState.SHUTDOWN && this.callCount === 0) {
this.idleTimer = setTimeout(() => {
this.trace(
'Idle timer triggered after ' +
@@ -706,6 +706,9 @@ export class InternalChannel {
this.resolvingLoadBalancer.destroy();
this.updateState(ConnectivityState.SHUTDOWN);
clearInterval(this.callRefTimer);
if (this.idleTimer) {
clearTimeout(this.idleTimer);
}
if (this.channelzEnabled) {
unregisterChannelzRef(this.channelzRef);
}