Detroy the driver when running :server disconnect

pe4cey · pe4cey · commit d14841290142 · 2016-04-20T15:29:21.000+01:00
diff --git a/app/scripts/services/Auth.coffee b/app/scripts/services/Auth.coffee
@@ -117,6 +117,7 @@ angular.module('neo4jApp.services')
         if @getCurrentUser()
           clearConnectionAuthData()
         ConnectionStatusService.setConnected no
+        ProtocolFactory.getAuthService().clearConnection()
 
       setNewPassword: (old_passwd, new_passwd) ->
         that = @
diff --git a/app/scripts/services/Bolt.coffee b/app/scripts/services/Bolt.coffee
@@ -88,6 +88,10 @@ angular.module('neo4jApp.services')
           )
         q.promise
 
+      clearConnection = ->
+        _driver.close() if _driver?
+        _driver = null
+
       createSession = () ->
         return _driver.session() if _driver
         return no
@@ -394,5 +398,6 @@ angular.module('neo4jApp.services')
           schemaResultToRESTResult indexes, constraints
         constructJmxResult: jmxResultToRESTResult
         constructVersionResult: versionResultToRESTResult
+        clearConnection: clearConnection
       }
   ]
diff --git a/app/scripts/services/UtilityBolt.coffee b/app/scripts/services/UtilityBolt.coffee
@@ -27,6 +27,7 @@ angular.module('neo4jApp.services')
     '$q'
     (Bolt, Settings, $q) ->
       {
+        clearConnection: -> Bolt.clearConnection()
         getSchema: ->
           q = $q.defer()
           $q.all([
diff --git a/app/scripts/services/UtilityREST.coffee b/app/scripts/services/UtilityREST.coffee
@@ -27,6 +27,7 @@ angular.module('neo4jApp.services')
     '$q'
     (Server, Settings, $q) ->
       {
+        clearConnection: -> angular.noop
         getJmx: (whatToGet = []) ->
           Server.jmx(whatToGet)
 

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,10 @@ angular.module('neo4jApp.services')`
`88`	`88`	`)`
`89`	`89`	`q.promise`
`90`	`90`
	`91`	`+ clearConnection = ->`
	`92`	`+ _driver.close() if _driver?`
	`93`	`+ _driver = null`
	`94`	`+`
`91`	`95`	`createSession = () ->`
`92`	`96`	`return _driver.session() if _driver`
`93`	`97`	`return no`
`@@ -394,5 +398,6 @@ angular.module('neo4jApp.services')`
`394`	`398`	`schemaResultToRESTResult indexes, constraints`
`395`	`399`	`constructJmxResult: jmxResultToRESTResult`
`396`	`400`	`constructVersionResult: versionResultToRESTResult`
	`401`	`+ clearConnection: clearConnection`
`397`	`402`	`}`
`398`	`403`	`]`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ angular.module('neo4jApp.services')`
`27`	`27`	`'$q'`
`28`	`28`	`(Bolt, Settings, $q) ->`
`29`	`29`	`{`
	`30`	`+ clearConnection: -> Bolt.clearConnection()`
`30`	`31`	`getSchema: ->`
`31`	`32`	`q = $q.defer()`
`32`	`33`	`$q.all([`