Skip to content

Commit f69ab81

Browse files
committed
fix hanging
1 parent fb7d617 commit f69ab81

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

src/mongo_client.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -614,19 +614,12 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
614614
const topology = this.topology;
615615
this.topology = undefined;
616616

617-
await new Promise<void>((resolve, reject) => {
618-
topology.close({ force }, error => {
619-
if (error) return reject(error);
620-
const { encrypter } = this[kOptions];
621-
if (encrypter) {
622-
return encrypter.closeCallback(this, force, error => {
623-
if (error) return reject(error);
624-
resolve();
625-
});
626-
}
627-
resolve();
628-
});
629-
});
617+
topology.close();
618+
619+
const { encrypter } = this[kOptions];
620+
if (encrypter) {
621+
await encrypter.close(this, force);
622+
}
630623
}
631624

632625
/**

src/sdam/topology.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
469469
(err, server) => {
470470
if (err) {
471471
this.close();
472-
exitWithError(err);
472+
return exitWithError(err);
473473
}
474474

475475
const skipPingOnConnect = this.s.options[Symbol.for('@@mdb.skipPingOnConnect')] === true;

0 commit comments

Comments
 (0)