Commit 32a3c7b897fb3d01741eba43feb86f82451da7b9
Committed by
Andrew Shvayka
1 parent
3400ba2f
Moved hardcoded local datacenter name to config
Showing
2 changed files
with
5 additions
and
1 deletions
@@ -184,6 +184,8 @@ cassandra: | @@ -184,6 +184,8 @@ cassandra: | ||
184 | keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}" | 184 | keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}" |
185 | # Specify node list | 185 | # Specify node list |
186 | url: "${CASSANDRA_URL:127.0.0.1:9042}" | 186 | url: "${CASSANDRA_URL:127.0.0.1:9042}" |
187 | + # Specify local datacenter name | ||
188 | + local_datacenter: "${CASSANDRA_LOCAL_DATACENTER:datacenter1}" | ||
187 | # Enable/disable secure connection | 189 | # Enable/disable secure connection |
188 | ssl: "${CASSANDRA_USE_SSL:false}" | 190 | ssl: "${CASSANDRA_USE_SSL:false}" |
189 | # Enable/disable JMX | 191 | # Enable/disable JMX |
@@ -36,6 +36,8 @@ public abstract class AbstractCassandraCluster { | @@ -36,6 +36,8 @@ public abstract class AbstractCassandraCluster { | ||
36 | private Boolean jmx; | 36 | private Boolean jmx; |
37 | @Value("${cassandra.metrics}") | 37 | @Value("${cassandra.metrics}") |
38 | private Boolean metrics; | 38 | private Boolean metrics; |
39 | + @Value("${cassandra.local_datacenter}") | ||
40 | + private String localDatacenter; | ||
39 | 41 | ||
40 | @Autowired | 42 | @Autowired |
41 | private CassandraDriverOptions driverOptions; | 43 | private CassandraDriverOptions driverOptions; |
@@ -82,7 +84,7 @@ public abstract class AbstractCassandraCluster { | @@ -82,7 +84,7 @@ public abstract class AbstractCassandraCluster { | ||
82 | if (this.keyspaceName != null) { | 84 | if (this.keyspaceName != null) { |
83 | this.sessionBuilder.withKeyspace(this.keyspaceName); | 85 | this.sessionBuilder.withKeyspace(this.keyspaceName); |
84 | } | 86 | } |
85 | - this.sessionBuilder.withLocalDatacenter("datacenter1"); | 87 | + this.sessionBuilder.withLocalDatacenter(localDatacenter); |
86 | session = sessionBuilder.build(); | 88 | session = sessionBuilder.build(); |
87 | if (this.metrics && this.jmx) { | 89 | if (this.metrics && this.jmx) { |
88 | MetricRegistry registry = | 90 | MetricRegistry registry = |