Fix connection timeout leak

porsager · porsager · commit 5e3fff861a8e · 2020-05-22T12:02:26.000+02:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -137,7 +137,7 @@ function Connection(options = {}) {
   }
 
   function connect() {
-    connect_timeout && (connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000))
+    connect_timeout && (clearTimeout(connect_timer), connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000))
     socket.connect()
   }
 
@@ -176,7 +176,7 @@ function Connection(options = {}) {
   }
 
   function onready(err) {
-    connect_timer && (clearTimeout(connect_timer), connect_timer = null)
+    clearTimeout(connect_timer)
     if (err) {
       if (backend.query) {
         err.stack += backend.query.origin.replace(/.*\n/, '\n')
@@ -226,7 +226,7 @@ function Connection(options = {}) {
   }
 
   function close() {
-    connect_timer && (clearTimeout(connect_timer), connect_timer = null)
+    clearTimeout(connect_timer)
     error(errors.connection('CONNECTION_CLOSED', options))
     statements = {}
     messages = []

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function Connection(options = {}) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`function connect() {`
`140`		`- connect_timeout && (connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000))`
	`140`	`+ connect_timeout && (clearTimeout(connect_timer), connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000))`
`141`	`141`	`socket.connect()`
`142`	`142`	`}`
`143`	`143`
`@@ -176,7 +176,7 @@ function Connection(options = {}) {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`function onready(err) {`
`179`		`- connect_timer && (clearTimeout(connect_timer), connect_timer = null)`
	`179`	`+ clearTimeout(connect_timer)`
`180`	`180`	`if (err) {`
`181`	`181`	`if (backend.query) {`
`182`	`182`	`err.stack += backend.query.origin.replace(/.*\n/, '\n')`
`@@ -226,7 +226,7 @@ function Connection(options = {}) {`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`function close() {`
`229`		`- connect_timer && (clearTimeout(connect_timer), connect_timer = null)`
	`229`	`+ clearTimeout(connect_timer)`
`230`	`230`	`error(errors.connection('CONNECTION_CLOSED', options))`
`231`	`231`	`statements = {}`
`232`	`232`	`messages = []`