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

made serviceInfoProvider not required for install application

Browse Source
This commit is contained in:
dshvaika 2025-05-23 13:32:35 +03:00
parent 35e9d007d0
commit 508fa081bf
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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