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

Minor refactoring

Browse Source
This commit is contained in:
ViacheslavKlimov 2022-10-04 13:07:21 +03:00
parent 8694611f7a
commit 7eea5a6cda
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View File

@ -184,7 +184,10 @@ public class DefaultDataUpdateService implements DataUpdateService {
boolean skipAuditLogsMigration = getEnv("TB_SKIP_AUDIT_LOGS_MIGRATION", false); boolean skipAuditLogsMigration = getEnv("TB_SKIP_AUDIT_LOGS_MIGRATION", false);
if (!skipAuditLogsMigration) { if (!skipAuditLogsMigration) {
log.info("Updating data from version 3.4.1 to 3.4.2 ..."); log.info("Updating data from version 3.4.1 to 3.4.2 ...");
log.info("Starting audit logs migration. Can be skipped with TB_SKIP_AUDIT_LOGS_MIGRATION env variable set to true");
auditLogDao.migrateAuditLogs(); auditLogDao.migrateAuditLogs();
} else {
log.info("Skipping audit logs migration");
} }
break; break;
default: default:

4
application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java
View File

@ -49,8 +49,8 @@ public class AuditLogsCleanUpService extends AbstractCleanUpService {
this.partitioningRepository = partitioningRepository; this.partitioningRepository = partitioningRepository;
} }
@Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.audit_logs.execution_interval_ms})}", @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.audit_logs.checking_interval_ms})}",
fixedDelayString = "${sql.ttl.audit_logs.execution_interval_ms}") fixedDelayString = "${sql.ttl.audit_logs.checking_interval_ms}")
public void cleanUp() { public void cleanUp() {
long auditLogsExpTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(ttlInSec); long auditLogsExpTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(ttlInSec);
if (isSystemTenantPartitionMine()) { if (isSystemTenantPartitionMine()) {

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

@ -308,7 +308,7 @@ sql:
audit_logs: audit_logs:
enabled: "${SQL_TTL_AUDIT_LOGS_ENABLED:true}" enabled: "${SQL_TTL_AUDIT_LOGS_ENABLED:true}"
ttl: "${SQL_TTL_AUDIT_LOGS_SECS:0}" # Disabled by default. Accuracy of the cleanup depends on the sql.audit_logs.partition_size ttl: "${SQL_TTL_AUDIT_LOGS_SECS:0}" # Disabled by default. Accuracy of the cleanup depends on the sql.audit_logs.partition_size
execution_interval_ms: "${SQL_TTL_AUDIT_LOGS_EXECUTION_INTERVAL_MS:86400000}" # Default value - 1 day checking_interval_ms: "${SQL_TTL_AUDIT_LOGS_CHECKING_INTERVAL_MS:86400000}" # Default value - 1 day
relations: relations:
max_level: "${SQL_RELATIONS_MAX_LEVEL:50}" # //This value has to be reasonable small to prevent infinite recursion as early as possible max_level: "${SQL_RELATIONS_MAX_LEVEL:50}" # //This value has to be reasonable small to prevent infinite recursion as early as possible

1
dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/sql/SqlPartitioningRepository.java
View File

@ -63,6 +63,7 @@ public class SqlPartitioningRepository {
SqlPartition partition = new SqlPartition(table, partitionStartTs, partitionStartTs + partitionDurationMs, Long.toString(partitionStartTs)); SqlPartition partition = new SqlPartition(table, partitionStartTs, partitionStartTs + partitionDurationMs, Long.toString(partitionStartTs));
partitionCreationLock.lock(); partitionCreationLock.lock();
try { try {
if (partitions.containsKey(partitionStartTs)) return;
log.trace("Saving partition: {}", partition); log.trace("Saving partition: {}", partition);
save(partition); save(partition);
log.trace("Adding partition to map: {}", partition); log.trace("Adding partition to map: {}", partition);