diff --git a/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java b/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java index e640e6ee..2e49236f 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java +++ b/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java @@ -14,6 +14,7 @@ import java.util.regex.Pattern; import static bubble.ApiConstants.enumFromString; import static org.cobbzilla.util.daemon.ZillaRuntime.empty; +import static org.cobbzilla.util.daemon.ZillaRuntime.now; @Accessors(chain=true) public class NodeProgressMeterTick { @@ -23,6 +24,15 @@ public class NodeProgressMeterTick { @JsonCreator public static TickMatchType fromString(String v) { return enumFromString(TickMatchType.class, v); } } + public NodeProgressMeterTick() { + this.ctime = now(); + } + + @Setter private Long ctime; + // backward compatibility - the following getter may be removed and default one may be used after some time, while + // ctime can be changed to be of simple `long` type + public long getCtime() { return ctime == null ? 0 : ctime; } + @Getter @Setter private String account; public boolean hasAccount() { return !empty(account); } diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java index e5eac9a7..f83ac757 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java @@ -143,7 +143,7 @@ public class StandardNetworkService implements NetworkService { NodeProgressMeter progressMeter = null; try { progressMeter = new NodeProgressMeter(nn, getNetworkSetupStatus()); - progressMeter.reset(); + progressMeter.write(METER_TICK_CONFIRMING_NETWORK_LOCK); if (!confirmLock(nn.getNetwork(), lock)) { diff --git a/bubble-web b/bubble-web index cf386923..02bdacd7 160000 --- a/bubble-web +++ b/bubble-web @@ -1 +1 @@ -Subproject commit cf3869232598970292724bf6c72b79d18c1d7c33 +Subproject commit 02bdacd77a9989aa14451500b225b0888b6b2623