Skip to content

Commit 226de19

Browse files
committed
Removed Unhandled rejection warning
1 parent 0630b64 commit 226de19

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

src/v1/driver.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class Driver {
117117
if (this.onError && err.code === SERVICE_UNAVAILABLE) {
118118
this.onError(err);
119119
} else {
120-
return Promise.reject(err);
120+
//we don't need to tell the driver about this error
121121
}
122122
});
123123
return this._createSession(connectionPromise, (cb) => {
@@ -130,13 +130,14 @@ class Driver {
130130

131131
// Queue up a 'reset', to ensure the next user gets a clean
132132
// session to work with.
133+
133134
connectionPromise.then( (conn) => {
134135
conn.reset();
135136
conn.sync();
136137

137138
// Return connection to the pool
138139
conn._release();
139-
});
140+
}).catch( () => {/*ignore errors here*/});
140141

141142
// Call user callback
142143
if (cb) {
@@ -165,7 +166,6 @@ class Driver {
165166
if (this._openSessions.hasOwnProperty(sessionId)) {
166167
this._openSessions[sessionId].close();
167168
}
168-
169169
this._pool.purgeAll();
170170
}
171171
}

src/v1/error.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
let SERVICE_UNAVAILABLE = 'ServiceUnavailable';
2424
let SESSION_EXPIRED = 'SessionExpired';
2525
function newError(message, code="N/A") {
26-
// TODO: Idea is that we can check the cod here and throw sub-classes
26+
// TODO: Idea is that we can check the code here and throw sub-classes
2727
// of Neo4jError as appropriate
2828
return new Neo4jError(message, code);
2929
}

src/v1/routing-driver.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class RoutingDriver extends Driver {
6363
} else {
6464
connectionPromise.then((conn) => {
6565
this._forget(conn.url);
66-
});
66+
}).catch(() => {/*ignore*/});
6767
}
6868
return err;
6969
} else if (code === 'Neo.ClientError.Cluster.NotALeader') {
@@ -74,7 +74,7 @@ class RoutingDriver extends Driver {
7474
} else {
7575
connectionPromise.then((conn) => {
7676
this._clusterView.writers.remove(conn.url);
77-
});
77+
}).catch(() => {/*ignore*/});
7878
}
7979
return newError("No longer possible to write to server at " + url, SESSION_EXPIRED);
8080
} else {
@@ -87,19 +87,19 @@ class RoutingDriver extends Driver {
8787
if (!this._clusterView.needsUpdate()) {
8888
return Promise.resolve(this._clusterView);
8989
} else {
90+
let p = () => {
91+
let conn = this._pool.acquire(routers.hop());
92+
let session = this._createSession(Promise.resolve(conn));
93+
return newClusterView(session).catch((err) => {
94+
this._forget(conn);
95+
return Promise.reject(err);
96+
});
97+
};
9098
let routers = this._clusterView.routers;
9199
let acc = Promise.reject();
92100
for (let i = 0; i < routers.size(); i++) {
93-
acc = acc.catch(() => {
94-
let conn = this._pool.acquire(routers.hop());
95-
let session = this._createSession(Promise.resolve(conn));
96-
return newClusterView(session).catch((err) => {
97-
this._forget(conn);
98-
return Promise.reject(err);
99-
});
100-
});
101+
acc = acc.catch(p);
101102
}
102-
103103
return acc;
104104
}
105105
}
@@ -139,7 +139,7 @@ class RoutingDriver extends Driver {
139139
} else {
140140
return Promise.reject(m + " is not a valid option");
141141
}
142-
});
142+
}).catch((err) => {return Promise.reject(err)});
143143
}
144144

145145
_forget(url) {

test/v1/routing.driver.boltkit.it.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,19 @@ describe('routing driver ', function() {
123123

124124
kit.run(function () {
125125
var driver = neo4j.driver("bolt+routing://127.0.0.1:9001", neo4j.auth.basic("neo4j", "neo4j"));
126+
126127
// When
127128
var session = driver.session(neo4j.READ);
128129
session.run("MATCH (n) RETURN n.name").catch(function (err) {
129130
expect(err.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE);
131+
132+
session.close();
130133
driver.close();
131134
server.exit(function (code) {
132135
expect(code).toEqual(0);
133136
done();
134137
});
135-
});
138+
}).catch(function (err) {console.log(err)});
136139
});
137140
});
138141

0 commit comments

Comments
 (0)