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

Fix upgrade script and improved variable names

Browse Source
This commit is contained in:
Andrii Shvaika 2024-11-28 17:50:55 +02:00
parent d92681cf71
commit 2900d3c1ed
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/upgrade/3.8.1/schema_update.sql
View File

@ -33,7 +33,7 @@ $$
BEGIN BEGIN
IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'rule_node' AND column_name = 'debug_settings') IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'rule_node' AND column_name = 'debug_settings')
THEN THEN
UPDATE rule_node SET debug_settings = '{"failuresEnabled": true, "allEnabledUntil": ' || (extract(epoch from now()) + 900) * 1000 || '}' WHERE debug_mode = true; -- 15 minutes according to thingsboard.yml default settings. UPDATE rule_node SET debug_settings = '{"failuresEnabled": true, "allEnabledUntil": ' || cast((extract(epoch from now()) + 900) * 1000 as bigint) || '}' WHERE debug_mode = true; -- 15 minutes according to thingsboard.yml default settings.
ALTER TABLE rule_node DROP COLUMN debug_mode; ALTER TABLE rule_node DROP COLUMN debug_mode;
END IF; END IF;
END END

3
application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
View File

@ -26,7 +26,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import org.thingsboard.common.util.DebugModeUtil;
import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.ActorSystemContext;
import org.thingsboard.server.actors.TbActorRef; import org.thingsboard.server.actors.TbActorRef;
import org.thingsboard.server.actors.ruleChain.DefaultTbContext; import org.thingsboard.server.actors.ruleChain.DefaultTbContext;
@ -837,7 +836,7 @@ class DefaultTbContextTest {
// GIVEN // GIVEN
Mockito.clearInvocations(mainCtxMock); Mockito.clearInvocations(mainCtxMock);
ruleNode.setDebugSettings(new DebugSettings(ruleNode.getDebugSettings().isDebugFailures(), 0)); ruleNode.setDebugSettings(new DebugSettings(ruleNode.getDebugSettings().isFailuresEnabled(), 0));
// WHEN // WHEN
defaultTbContext.tellNext(msg, connection); defaultTbContext.tellNext(msg, connection);

19
common/data/src/main/java/org/thingsboard/server/common/data/debug/DebugSettings.java
View File

@ -16,7 +16,6 @@
package org.thingsboard.server.common.data.debug; package org.thingsboard.server.common.data.debug;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -27,18 +26,18 @@ public class DebugSettings {
private static DebugSettings DEBUG_OFF = new DebugSettings(false, 0); private static DebugSettings DEBUG_OFF = new DebugSettings(false, 0);
private static DebugSettings DEBUG_FAILURES = new DebugSettings(true, 0); private static DebugSettings DEBUG_FAILURES = new DebugSettings(true, 0);
public DebugSettings(boolean debugFailures, long debugAllUntil) { public DebugSettings(boolean failuresEnabled, long allEnabledUntil) {
this.debugFailures = debugFailures; this.failuresEnabled = failuresEnabled;
this.debugAll = false; this.allEnabled = false;
this.debugAllUntil = debugAllUntil; this.allEnabledUntil = allEnabledUntil;
} }
@Schema(description = "Debug failures. ", example = "false") @Schema(description = "Debug failures. ", example = "false")
private boolean debugFailures; private boolean failuresEnabled;
@Schema(description = "Debug All. Used as a trigger for updating debugAllUntil.", example = "false") @Schema(description = "Debug All. Used as a trigger for updating debugAllUntil.", example = "false")
private boolean debugAll; private boolean allEnabled;
@Schema(description = "Timestamp of the end time for the processing debug events.") @Schema(description = "Timestamp of the end time for the processing debug events.")
private long debugAllUntil; private long allEnabledUntil;
public static DebugSettings off() {return DebugSettings.DEBUG_OFF;} public static DebugSettings off() {return DebugSettings.DEBUG_OFF;}
@ -50,11 +49,11 @@ public class DebugSettings {
public static DebugSettings all() { public static DebugSettings all() {
var ds = new DebugSettings(); var ds = new DebugSettings();
ds.setDebugAll(true); ds.setAllEnabled(true);
return ds; return ds;
} }
public DebugSettings copy(long maxDebugAllUntil) { public DebugSettings copy(long maxDebugAllUntil) {
return new DebugSettings(debugFailures, debugAll ? maxDebugAllUntil : Math.min(debugAllUntil, maxDebugAllUntil)); return new DebugSettings(failuresEnabled, allEnabled ? maxDebugAllUntil : Math.min(allEnabledUntil, maxDebugAllUntil));
} }
} }

7
common/util/src/main/java/org/thingsboard/common/util/DebugModeUtil.java
View File

@ -16,7 +16,6 @@
package org.thingsboard.common.util; package org.thingsboard.common.util;
import org.thingsboard.server.common.data.HasDebugSettings; import org.thingsboard.server.common.data.HasDebugSettings;
import org.thingsboard.server.common.data.debug.DebugSettings;
import org.thingsboard.server.common.data.msg.TbNodeConnectionType; import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
import java.util.Set; import java.util.Set;
@ -38,7 +37,7 @@ public final class DebugModeUtil {
public static boolean isDebugAllAvailable(HasDebugSettings debugSettingsAware) { public static boolean isDebugAllAvailable(HasDebugSettings debugSettingsAware) {
var debugSettings = debugSettingsAware.getDebugSettings(); var debugSettings = debugSettingsAware.getDebugSettings();
return debugSettings != null && debugSettings.getDebugAllUntil() > System.currentTimeMillis(); return debugSettings != null && debugSettings.getAllEnabledUntil() > System.currentTimeMillis();
} }
public static boolean isDebugAvailable(HasDebugSettings debugSettingsAware, String nodeConnection) { public static boolean isDebugAvailable(HasDebugSettings debugSettingsAware, String nodeConnection) {
@ -46,7 +45,7 @@ public final class DebugModeUtil {
return true; return true;
} else { } else {
var debugSettings = debugSettingsAware.getDebugSettings(); var debugSettings = debugSettingsAware.getDebugSettings();
return debugSettings != null && debugSettings.isDebugFailures() && TbNodeConnectionType.FAILURE.equals(nodeConnection); return debugSettings != null && debugSettings.isFailuresEnabled() && TbNodeConnectionType.FAILURE.equals(nodeConnection);
} }
} }
@ -55,7 +54,7 @@ public final class DebugModeUtil {
return true; return true;
} else { } else {
var debugSettings = debugSettingsAware.getDebugSettings(); var debugSettings = debugSettingsAware.getDebugSettings();
return debugSettings != null && nodeConnections != null && debugSettings.isDebugFailures() && nodeConnections.contains(TbNodeConnectionType.FAILURE); return debugSettings != null && nodeConnections != null && debugSettings.isFailuresEnabled() && nodeConnections.contains(TbNodeConnectionType.FAILURE);
} }
} }
} }