Skip to content

Commit a678bdc

Browse files
committed
Revert "Introduce sessionConnectionTimeout and updateRoutingTableTimeout (#966)"
This reverts commit 0badd1f.
1 parent 0badd1f commit a678bdc

File tree

14 files changed

+150
-963
lines changed

14 files changed

+150
-963
lines changed

packages/bolt-connection/src/connection-provider/connection-provider-direct.js

+6-12
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
ConnectionErrorHandler
2525
} from '../connection'
2626
import { internal, error } from 'neo4j-driver-core'
27-
import { controller } from '../lang'
2827

2928
const {
3029
constants: { BOLT_PROTOCOL_V3, BOLT_PROTOCOL_V4_0, BOLT_PROTOCOL_V4_4 }
@@ -50,17 +49,12 @@ export default class DirectConnectionProvider extends PooledConnectionProvider {
5049
this._handleAuthorizationExpired(error, address, database)
5150
})
5251

53-
const acquireConnectionJob = {
54-
run: () => this._connectionPool
55-
.acquire(this._address)
56-
.then(
57-
connection =>
58-
new DelegateConnection(connection, databaseSpecificErrorHandler)
59-
),
60-
onTimeout: connection => connection._release()
61-
}
62-
63-
return controller.runWithTimeout(this._sessionConnectionTimeoutConfig, acquireConnectionJob)
52+
return this._connectionPool
53+
.acquire(this._address)
54+
.then(
55+
connection =>
56+
new DelegateConnection(connection, databaseSpecificErrorHandler)
57+
)
6458
}
6559

6660
_handleAuthorizationExpired (error, address, database) {

packages/bolt-connection/src/connection-provider/connection-provider-pooled.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import { createChannelConnection, ConnectionErrorHandler } from '../connection'
2121
import Pool, { PoolConfig } from '../pool'
22-
import { error, newError, ConnectionProvider } from 'neo4j-driver-core'
22+
import { error, ConnectionProvider } from 'neo4j-driver-core'
2323

2424
const { SERVICE_UNAVAILABLE } = error
2525
export default class PooledConnectionProvider extends ConnectionProvider {
@@ -58,12 +58,6 @@ export default class PooledConnectionProvider extends ConnectionProvider {
5858
log: this._log
5959
})
6060
this._openConnections = {}
61-
this._sessionConnectionTimeoutConfig = {
62-
timeout: this._config.sessionConnectionTimeout,
63-
reason: () => newError(
64-
`Session acquisition timed out in ${this._config.sessionConnectionTimeout} ms.`
65-
)
66-
}
6761
}
6862

6963
_createConnectionErrorHandler () {

0 commit comments

Comments
 (0)