Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix hanging
  • Loading branch information
W-A-James committed Mar 6, 2024
commit f69ab8162d90782be49f5c27baeef8e43332304f
19 changes: 6 additions & 13 deletions src/mongo_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -614,19 +614,12 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
const topology = this.topology;
this.topology = undefined;

await new Promise<void>((resolve, reject) => {
topology.close({ force }, error => {
if (error) return reject(error);
const { encrypter } = this[kOptions];
if (encrypter) {
return encrypter.closeCallback(this, force, error => {
if (error) return reject(error);
resolve();
});
}
resolve();
});
});
topology.close();

const { encrypter } = this[kOptions];
if (encrypter) {
await encrypter.close(this, force);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/sdam/topology.ts
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
(err, server) => {
if (err) {
this.close();
exitWithError(err);
return exitWithError(err);
}

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