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

Correct logging and thread pool names

Browse Source
This commit is contained in:
Andrii Shvaika 2022-02-18 18:09:24 +02:00
parent d0e7c34659
commit c577b50e9d
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
View File

@ -157,6 +157,11 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
} }
} }
@Override
protected String getServiceName() {
return "API Usage";
}
@Override @Override
protected String getSchedulerExecutorName() { protected String getSchedulerExecutorName() {
return "api-usage-scheduled"; return "api-usage-scheduled";

18
application/src/main/java/org/thingsboard/server/service/partition/AbstractPartitionBasedService.java
View File

@ -41,6 +41,8 @@ public abstract class AbstractPartitionBasedService<T extends EntityId> extends
protected ListeningScheduledExecutorService scheduledExecutor; protected ListeningScheduledExecutorService scheduledExecutor;
abstract protected String getServiceName();
abstract protected String getSchedulerExecutorName(); abstract protected String getSchedulerExecutorName();
abstract protected void onAddedPartitions(Set<TopicPartitionInfo> addedPartitions); abstract protected void onAddedPartitions(Set<TopicPartitionInfo> addedPartitions);
@ -53,7 +55,7 @@ public abstract class AbstractPartitionBasedService<T extends EntityId> extends
protected void init() { protected void init() {
// Should be always single threaded due to absence of locks. // Should be always single threaded due to absence of locks.
scheduledExecutor = MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("device-state-scheduled"))); scheduledExecutor = MoreExecutors.listeningDecorator(Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName(getSchedulerExecutorName())));
} }
protected ServiceType getServiceType() { protected ServiceType getServiceType() {
@ -93,18 +95,18 @@ public abstract class AbstractPartitionBasedService<T extends EntityId> extends
private void initStateFromDB(Set<TopicPartitionInfo> partitions) { private void initStateFromDB(Set<TopicPartitionInfo> partitions) {
try { try {
log.info("CURRENT PARTITIONS: {}", partitionedEntities.keySet()); log.info("[{}] CURRENT PARTITIONS: {}", getServiceName(), partitionedEntities.keySet());
log.info("NEW PARTITIONS: {}", partitions); log.info("[{}] NEW PARTITIONS: {}", getServiceName(), partitions);
Set<TopicPartitionInfo> addedPartitions = new HashSet<>(partitions); Set<TopicPartitionInfo> addedPartitions = new HashSet<>(partitions);
addedPartitions.removeAll(partitionedEntities.keySet()); addedPartitions.removeAll(partitionedEntities.keySet());
log.info("ADDED PARTITIONS: {}", addedPartitions); log.info("[{}] ADDED PARTITIONS: {}", getServiceName(), addedPartitions);
Set<TopicPartitionInfo> removedPartitions = new HashSet<>(partitionedEntities.keySet()); Set<TopicPartitionInfo> removedPartitions = new HashSet<>(partitionedEntities.keySet());
removedPartitions.removeAll(partitions); removedPartitions.removeAll(partitions);
log.info("REMOVED PARTITIONS: {}", removedPartitions); log.info("[{}] REMOVED PARTITIONS: {}", getServiceName(), removedPartitions);
// We no longer manage current partition of entities; // We no longer manage current partition of entities;
removedPartitions.forEach(partition -> { removedPartitions.forEach(partition -> {
@ -120,12 +122,12 @@ public abstract class AbstractPartitionBasedService<T extends EntityId> extends
onAddedPartitions(addedPartitions); onAddedPartitions(addedPartitions);
} }
log.info("Managing following partitions:"); log.info("[{}] Managing following partitions:", getServiceName());
partitionedEntities.forEach((tpi, entities) -> { partitionedEntities.forEach((tpi, entities) -> {
log.info("[{}]: {} entities", tpi.getFullTopicName(), entities.size()); log.info("[{}][{}]: {} entities", getServiceName(), tpi.getFullTopicName(), entities.size());
}); });
} catch (Throwable t) { } catch (Throwable t) {
log.warn("Failed to init entities state from DB", t); log.warn("[{}] Failed to init entities state from DB", getServiceName(), t);
} }
} }

6
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View File

@ -162,6 +162,12 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
} }
} }
@Override
protected String getServiceName() {
return "Device State";
}
@Override @Override
protected String getSchedulerExecutorName() { protected String getSchedulerExecutorName() {
return "device-state-scheduled"; return "device-state-scheduled";