瀏覽代碼

fix bugs in first-time setup

tags/v1.1.1^0
Jonathan Cobb 4 年之前
父節點
當前提交
be81fe3130
共有 4 個文件被更改,包括 8 次插入8 次删除
  1. +2
    -2
      bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
  2. +4
    -4
      bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java
  3. +1
    -1
      bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
  4. +1
    -1
      utils/cobbzilla-wizard

+ 2
- 2
bubble-server/src/main/java/bubble/server/BubbleConfiguration.java 查看文件

@@ -336,8 +336,8 @@ public class BubbleConfiguration extends PgRestServerConfiguration
private final AtomicReference<Map<String, Object>> publicSystemConfigs = new AtomicReference<>();

public Map<String, Object> getPublicSystemConfigs () {
final var thisNetwork = getThisNetwork();
final var awaitingRestore = thisNetwork != null && thisNetwork.getState() == BubbleNetworkState.restoring;
final BubbleNetwork thisNetwork = getThisNetwork();
final boolean awaitingRestore = thisNetwork != null && thisNetwork.getState() == BubbleNetworkState.restoring;

synchronized (publicSystemConfigs) {
if (publicSystemConfigs.get() == null) {


+ 4
- 4
bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java 查看文件

@@ -68,10 +68,6 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase<Bub
// .forEach(dao -> ((AbstractDAO) dao).getSearchView());
// }

// ensure system configs can be loaded properly
final Map<String, Object> configs = c.getPublicSystemConfigs();
if (empty(configs)) die("onStart: no system configs found"); // should never happen

final AccountDAO accountDAO = c.getBean(AccountDAO.class);
if (!accountDAO.activated()) {
final File nodeFile = THIS_NODE_FILE;
@@ -91,6 +87,10 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase<Bub
log.warn("onStart: thisNode was null, not doing standard initializations");
}

// ensure system configs can be loaded properly
final Map<String, Object> configs = c.getPublicSystemConfigs();
if (empty(configs)) die("onStart: no system configs found"); // should never happen

// start network monitor if we manage networks
if (c.isSageLauncher()) c.getBean(NetworkMonitorService.class).start();



+ 1
- 1
bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java 查看文件

@@ -188,7 +188,7 @@ public class StandardSelfNodeService implements SelfNodeService {
}
}

private OneWayFlag nullWarningPrinted = new OneWayFlag("nullWarningPrinted");
private final OneWayFlag nullWarningPrinted = new OneWayFlag("nullWarningPrinted");

public BubbleNode getThisNode () {
synchronized (thisNode) {


+ 1
- 1
utils/cobbzilla-wizard

@@ -1 +1 @@
Subproject commit e2783ac80f88f8b90ddca85fd7f0b487d3abaf47
Subproject commit 7716949a32c967ae62989d52745146b9cfcb8698

Loading…
取消
儲存