Browse Source

Add ctime to ticks-stats returned to FE

pull/20/head
Kristijan Mitrovic 4 years ago
parent
commit
7dc3533499
3 changed files with 12 additions and 2 deletions
  1. +10
    -0
      bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java
  2. +1
    -1
      bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java
  3. +1
    -1
      bubble-web

+ 10
- 0
bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeterTick.java View File

@@ -14,6 +14,7 @@ import java.util.regex.Pattern;


import static bubble.ApiConstants.enumFromString; import static bubble.ApiConstants.enumFromString;
import static org.cobbzilla.util.daemon.ZillaRuntime.empty; import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
import static org.cobbzilla.util.daemon.ZillaRuntime.now;


@Accessors(chain=true) @Accessors(chain=true)
public class NodeProgressMeterTick { public class NodeProgressMeterTick {
@@ -23,6 +24,15 @@ public class NodeProgressMeterTick {
@JsonCreator public static TickMatchType fromString(String v) { return enumFromString(TickMatchType.class, v); } @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; @Getter @Setter private String account;
public boolean hasAccount() { return !empty(account); } public boolean hasAccount() { return !empty(account); }




+ 1
- 1
bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java View File

@@ -143,7 +143,7 @@ public class StandardNetworkService implements NetworkService {
NodeProgressMeter progressMeter = null; NodeProgressMeter progressMeter = null;
try { try {
progressMeter = new NodeProgressMeter(nn, getNetworkSetupStatus()); progressMeter = new NodeProgressMeter(nn, getNetworkSetupStatus());
progressMeter.reset();
progressMeter.write(METER_TICK_CONFIRMING_NETWORK_LOCK); progressMeter.write(METER_TICK_CONFIRMING_NETWORK_LOCK);


if (!confirmLock(nn.getNetwork(), lock)) { if (!confirmLock(nn.getNetwork(), lock)) {


+ 1
- 1
bubble-web

@@ -1 +1 @@
Subproject commit cf3869232598970292724bf6c72b79d18c1d7c33
Subproject commit 02bdacd77a9989aa14451500b225b0888b6b2623

Loading…
Cancel
Save