Browse Source

made serviceInfoProvider not required for install application

pull/13428/head
dshvaika 1 year ago
parent
commit
508fa081bf
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
  3. 3
      dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java

2
dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java

@ -52,7 +52,7 @@ public class CassandraBufferedRateReadExecutor extends AbstractBufferedRateExecu
@Autowired StatsFactory statsFactory,
@Autowired EntityService entityService,
@Autowired RateLimitService rateLimitService,
@Autowired TbServiceInfoProvider serviceInfoProvider) {
@Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, statsFactory,
entityService, rateLimitService, serviceInfoProvider, printTenantNames);
}

2
dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java

@ -52,7 +52,7 @@ public class CassandraBufferedRateWriteExecutor extends AbstractBufferedRateExec
@Autowired StatsFactory statsFactory,
@Autowired EntityService entityService,
@Autowired RateLimitService rateLimitService,
@Autowired TbServiceInfoProvider serviceInfoProvider) {
@Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, statsFactory,
entityService, rateLimitService, serviceInfoProvider, printTenantNames);
}

3
dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java

@ -141,6 +141,9 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
}
private LimitedApi getMyLimitedApi() {
if (serviceInfoProvider == null) {
return getBufferedRateExecutorType().getMonolithLimitedApi();
}
if (serviceInfoProvider.isMonolith()) {
return getBufferedRateExecutorType().getMonolithLimitedApi();
}

Loading…
Cancel
Save