Ensure connections are closed

Author: porsager

lib/connection.js

@@ -137,6 +137,7 @@ function Connection(options = {}) {
         : (messages.push(buffer), connect())
     } catch (err) {
       query.reject(err)
+      idle()
     }
   }
 
@@ -178,8 +179,10 @@ function Connection(options = {}) {
   }
 
   function idle() {
-    clearTimeout(timer)
-    timer = setTimeout(socket.end, idle_timeout * 1000)
+    if (idle_timeout && !backend.query && queries.length === 0) {
+      clearTimeout(timer)
+      timer = setTimeout(socket.end, idle_timeout * 1000)
+    }
   }
 
   function onready(err) {
@@ -204,7 +207,7 @@ function Connection(options = {}) {
     }
 
     backend.query = backend.error = null
-    idle_timeout && queries.length === 0 && idle()
+    idle()
 
     if (!open) {
       messages.forEach(socket.write)
@@ -303,6 +306,7 @@ function postgresSocket(options, {
       socket.write(frontend.connect(options))
     } catch (e) {
       error(e)
+      socket.end()
     }
   }