Merge pull request #28 from ajordens/conditional-on-cassandra-metrics

ajordens · ajordens · commit 28b8304ed311 · 2015-12-10T12:47:31.000-08:00
Spectator metrics are now conditionally enabled
diff --git a/kork-cassandra/src/main/java/com/netflix/spinnaker/kork/astyanax/AstyanaxComponents.java b/kork-cassandra/src/main/java/com/netflix/spinnaker/kork/astyanax/AstyanaxComponents.java
@@ -95,6 +95,7 @@ public ClusterHostSupplierFactory clusterHostSupplierFactory() {
 
     @Bean
     @ConditionalOnBean(Registry.class)
+    @ConditionalOnProperty("cassandra.metrics.enabled")
     public KeyspaceConnectionPoolMonitorFactory spectatorConnectionPoolMonitor(Registry registry) {
       return SpectatorConnectionPoolMonitor.factory(registry);
     }

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ public ClusterHostSupplierFactory clusterHostSupplierFactory() {`
`95`	`95`
`96`	`96`	`@Bean`
`97`	`97`	`@ConditionalOnBean(Registry.class)`
	`98`	`+ @ConditionalOnProperty("cassandra.metrics.enabled")`
`98`	`99`	`public KeyspaceConnectionPoolMonitorFactory spectatorConnectionPoolMonitor(Registry registry) {`
`99`	`100`	`return SpectatorConnectionPoolMonitor.factory(registry);`
`100`	`101`	`}`