Merge pull request #493 from lutovich/1.6-startup-logging

ali-ince · web-flow · commit f381a38e041f · 2018-04-24T16:54:24.000+01:00
Log driver's hashCode during startup and shutdown
diff --git a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
@@ -38,9 +38,9 @@
 import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancingStrategy;
 import org.neo4j.driver.internal.cluster.loadbalancing.RoundRobinLoadBalancingStrategy;
 import org.neo4j.driver.internal.logging.NettyLogging;
-import org.neo4j.driver.internal.metrics.MetricsListener;
 import org.neo4j.driver.internal.metrics.InternalAbstractMetrics;
 import org.neo4j.driver.internal.metrics.InternalMetrics;
+import org.neo4j.driver.internal.metrics.MetricsListener;
 import org.neo4j.driver.internal.metrics.spi.Metrics;
 import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
 import org.neo4j.driver.internal.retry.RetryLogic;
@@ -160,7 +160,7 @@ protected InternalDriver createDirectDriver( SecurityPlan securityPlan, BoltServ
         SessionFactory sessionFactory = createSessionFactory( connectionProvider, retryLogic, config );
         InternalDriver driver = createDriver(securityPlan, sessionFactory, metrics, config);
         Logger log = config.logging().getLog( Driver.class.getSimpleName() );
-        log.info( "Direct driver instance %s created for server address %s", driver, address.toString() );
+        log.info( "Direct driver instance %s created for server address %s", driver.hashCode(), address );
         return driver;
     }
 
@@ -181,7 +181,7 @@ protected InternalDriver createRoutingDriver( SecurityPlan securityPlan, BoltSer
         SessionFactory sessionFactory = createSessionFactory( connectionProvider, retryLogic, config );
         InternalDriver driver = createDriver(securityPlan, sessionFactory, metrics, config);
         Logger log = config.logging().getLog( Driver.class.getSimpleName() );
-        log.info( "Routing driver instance %s created for server address %s", driver, address.toString() );
+        log.info( "Routing driver instance %s created for server address %s", driver.hashCode(), address );
         return driver;
     }
 
diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java b/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
@@ -115,7 +115,7 @@ public CompletionStage<Void> closeAsync()
     {
         if ( closed.compareAndSet( false, true ) )
         {
-            log.info( "Closing driver instance %s", this );
+            log.info( "Closing driver instance %s", hashCode() );
             return sessionFactory.close();
         }
         return completedWithNull();

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public CompletionStage<Void> closeAsync()`
`115`	`115`	`{`
`116`	`116`	`if ( closed.compareAndSet( false, true ) )`
`117`	`117`	`{`
`118`		`- log.info( "Closing driver instance %s", this );`
	`118`	`+ log.info( "Closing driver instance %s", hashCode() );`
`119`	`119`	`return sessionFactory.close();`
`120`	`120`	`}`
`121`	`121`	`return completedWithNull();`