Skip to content

Commit 94de74f

Browse files
authored
Merge pull request #14206 from Automattic/vkarpov15/gh-14177
fix(ChangeStream): avoid suppressing errors in closed change stream
2 parents 485f155 + 4b77619 commit 94de74f

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

lib/cursor/ChangeStream.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ class ChangeStream extends EventEmitter {
6060

6161
driverChangeStreamEvents.forEach(ev => {
6262
this.driverChangeStream.on(ev, data => {
63-
// Sometimes Node driver still polls after close, so
64-
// avoid any uncaught exceptions due to closed change streams
65-
// See tests for gh-7022
66-
if (ev === 'error' && this.closed) {
67-
return;
68-
}
6963
if (data != null && data.fullDocument != null && this.options && this.options.hydrate) {
7064
data.fullDocument = this.options.model.hydrate(data.fullDocument);
7165
}
@@ -83,12 +77,6 @@ class ChangeStream extends EventEmitter {
8377

8478
driverChangeStreamEvents.forEach(ev => {
8579
this.driverChangeStream.on(ev, data => {
86-
// Sometimes Node driver still polls after close, so
87-
// avoid any uncaught exceptions due to closed change streams
88-
// See tests for gh-7022
89-
if (ev === 'error' && this.closed) {
90-
return;
91-
}
9280
if (data != null && data.fullDocument != null && this.options && this.options.hydrate) {
9381
data.fullDocument = this.options.model.hydrate(data.fullDocument);
9482
}

test/model.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,6 +3546,7 @@ describe('Model', function() {
35463546
assert.equal(changeData.operationType, 'insert');
35473547
assert.equal(changeData.fullDocument.name, 'Ned Stark');
35483548

3549+
await changeStream.close();
35493550
await db.close();
35503551
});
35513552

0 commit comments

Comments
 (0)