dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved hardcoded local datacenter name to config

Browse Source
This commit is contained in:
vzikratyi 2020-07-01 09:46:01 +03:00 committed by Andrew Shvayka
parent 3400ba2fc0
commit 32a3c7b897
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/resources/thingsboard.yml
View File

@ -184,6 +184,8 @@ cassandra:
keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}" keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}"
# Specify node list # Specify node list
url: "${CASSANDRA_URL:127.0.0.1:9042}" url: "${CASSANDRA_URL:127.0.0.1:9042}"
# Specify local datacenter name
local_datacenter: "${CASSANDRA_LOCAL_DATACENTER:datacenter1}"
# Enable/disable secure connection # Enable/disable secure connection
ssl: "${CASSANDRA_USE_SSL:false}" ssl: "${CASSANDRA_USE_SSL:false}"
# Enable/disable JMX # Enable/disable JMX

4
common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java
View File

@ -36,6 +36,8 @@ public abstract class AbstractCassandraCluster {
private Boolean jmx; private Boolean jmx;
@Value("${cassandra.metrics}") @Value("${cassandra.metrics}")
private Boolean metrics; private Boolean metrics;
@Value("${cassandra.local_datacenter}")
private String localDatacenter;
@Autowired @Autowired
private CassandraDriverOptions driverOptions; private CassandraDriverOptions driverOptions;
@ -82,7 +84,7 @@ public abstract class AbstractCassandraCluster {
if (this.keyspaceName != null) { if (this.keyspaceName != null) {
this.sessionBuilder.withKeyspace(this.keyspaceName); this.sessionBuilder.withKeyspace(this.keyspaceName);
} }
this.sessionBuilder.withLocalDatacenter("datacenter1"); this.sessionBuilder.withLocalDatacenter(localDatacenter);
session = sessionBuilder.build(); session = sessionBuilder.build();
if (this.metrics && this.jmx) { if (this.metrics && this.jmx) {
MetricRegistry registry = MetricRegistry registry =