Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #2010 - stop reconnect after .disconnect() #2323

Merged
merged 2 commits into from
Nov 24, 2022
Merged

fix #2010 - stop reconnect after .disconnect() #2323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e20b34
fix #2010 - stop reconnect after .disconnect()
leibale Nov 14, 2022
f3f4056
fix quit
leibale Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 18 additions & 8 deletions packages/client/lib/client/socket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export default class RedisSocket extends EventEmitter {
throw new Error('Socket already opened');
}

this.#isOpen = true;
return this.#connect();
}

Expand All @@ -116,7 +117,6 @@ export default class RedisSocket extends EventEmitter {
}

try {
this.#isOpen = true;
this.#socket = await this.#createSocket();
this.#writableNeedDrain = false;
this.emit('connect');
Expand All @@ -142,7 +142,7 @@ export default class RedisSocket extends EventEmitter {
await promiseTimeout(retryIn);
}
retries++;
} while (!this.#isReady);
} while (this.#isOpen && !this.#isReady);
}

#createSocket(): Promise<net.Socket | tls.TLSSocket> {
Expand Down Expand Up @@ -203,6 +203,8 @@ export default class RedisSocket extends EventEmitter {
this.#isReady = false;
this.emit('error', err);

if (!this.#isOpen) return;

this.#connect(true).catch(() => {
// the error was already emitted, silently ignore it
});
Expand All @@ -219,14 +221,22 @@ export default class RedisSocket extends EventEmitter {
}

disconnect(): void {
if (!this.#socket) {
if (!this.#isOpen) {
throw new ClientClosedError();
} else {
this.#isOpen = this.#isReady = false;
}

this.#socket.destroy();
this.#socket = undefined;
this.#isOpen = false;
this.#disconnect();
}

#disconnect(): void {
this.#isReady = false;

if (this.#socket) {
this.#socket.destroy();
this.#socket = undefined;
}

this.emit('end');
}

Expand All @@ -237,7 +247,7 @@ export default class RedisSocket extends EventEmitter {

this.#isOpen = false;
await fn();
this.disconnect();
this.#disconnect();
}

#isCorked = false;
Expand Down