Browse Source

name background threads

pull/51/head
Jonathan Cobb 4 years ago
parent
commit
89cc1fccba
14 changed files with 16 additions and 16 deletions
  1. +1
    -1
      bubble-server/src/main/java/bubble/dao/bill/AccountPlanDAO.java
  2. +2
    -2
      bubble-server/src/main/java/bubble/main/RekeyDatabaseMain.java
  3. +1
    -1
      bubble-server/src/main/java/bubble/resources/account/MeResource.java
  4. +1
    -1
      bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
  5. +1
    -1
      bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
  6. +1
    -1
      bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java
  7. +1
    -1
      bubble-server/src/main/java/bubble/service/backup/NetworkKeysService.java
  8. +1
    -1
      bubble-server/src/main/java/bubble/service/boot/ActivationService.java
  9. +1
    -1
      bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java
  10. +2
    -2
      bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java
  11. +1
    -1
      bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java
  12. +1
    -1
      bubble-server/src/main/java/bubble/service/dbfilter/DatabaseFilterService.java
  13. +1
    -1
      bubble-server/src/main/java/bubble/service/dbfilter/EntityIterator.java
  14. +1
    -1
      utils/cobbzilla-utils

+ 1
- 1
bubble-server/src/main/java/bubble/dao/bill/AccountPlanDAO.java View File

@@ -164,7 +164,7 @@ public class AccountPlanDAO extends AccountOwnedEntityDAO<AccountPlan> {
background(() -> {
sleep(PURCHASE_DELAY, "AccountPlanDAO.postCreate: waiting to finalize purchase");
paymentDriver.purchase(accountPlanUuid, paymentMethodUuid, billUuid);
});
}, "AccountPlanDAO.postCreate");
}
return super.postCreate(accountPlan, context);
}


+ 2
- 2
bubble-server/src/main/java/bubble/main/RekeyDatabaseMain.java View File

@@ -34,7 +34,7 @@ public class RekeyDatabaseMain extends BaseMain<RekeyDatabaseOptions> {
} catch (Exception e) {
die("READ ERROR: " + e);
}
});
}, "RekeyDatabaseMain.run.reader");

final AtomicReference<CommandResult> writeResult = new AtomicReference<>();
final Thread writer = runWriter(options, writeResult, options.getEnv());
@@ -58,7 +58,7 @@ public class RekeyDatabaseMain extends BaseMain<RekeyDatabaseOptions> {
} catch (Exception e) {
writeResult.set(new CommandResult(e).setExitStatus(-1));
}
}, e -> writeResult.set(new CommandResult(e).setExitStatus(-1)));
}, "RekeyDatabaseMain.runWriter", e -> writeResult.set(new CommandResult(e).setExitStatus(-1)));
}

public static Command readerCommand(RekeyDatabaseOptions options, Map<String, String> env) {


+ 1
- 1
bubble-server/src/main/java/bubble/resources/account/MeResource.java View File

@@ -452,7 +452,7 @@ public class MeResource {
if (!caller.admin()) return forbidden();
authenticatorService.ensureAuthenticated(ctx);

background(() -> jarUpgradeService.upgrade());
background(() -> jarUpgradeService.upgrade(), "MeResource.upgrade");
return ok(configuration.getPublicSystemConfigs());
}



+ 1
- 1
bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java View File

@@ -327,7 +327,7 @@ public class AccountPlansResource extends AccountOwnedResource<AccountPlan, Acco
getDao().update(found.setDeleting(true));

final String planUuid = found.getUuid();
background(() -> getDao().delete(planUuid));
background(() -> getDao().delete(planUuid), "AccountPlansResource.delete");

return ok(found.setDeletedNetwork(found.getNetwork()));
}


+ 1
- 1
bubble-server/src/main/java/bubble/server/BubbleConfiguration.java View File

@@ -385,7 +385,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
// called after activation, because now thisNetwork will be defined
public void refreshPublicSystemConfigs () {
synchronized (publicSystemConfigs) { publicSystemConfigs.set(null); }
background(this::getPublicSystemConfigs);
background(this::getPublicSystemConfigs, "BubbleConfiguration.refreshPublicSystemConfigs");
}

public boolean paymentsEnabled () {


+ 1
- 1
bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java View File

@@ -103,7 +103,7 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase<Bub
} catch (Exception e) {
die("onStart: error initializing driver for cloud: "+cloud.getName()+"/"+cloud.getUuid()+": "+shortError(e), e);
}
// background(() -> cloud.wireAndSetup(c));
// background(() -> cloud.wireAndSetup(c), "NodeInitializerListener.onStart.cloudInit);
}
}



+ 1
- 1
bubble-server/src/main/java/bubble/service/backup/NetworkKeysService.java View File

@@ -102,7 +102,7 @@ public class NetworkKeysService {
log.error("Cannot delete tmp backup folder " + backupDir, e);
}
}
});
}, "NetworkKeysService.startBackupDownload");
}

@NonNull public BackupPackagingStatus backupDownloadStatus(@NonNull final String keysCode) {


+ 1
- 1
bubble-server/src/main/java/bubble/service/boot/ActivationService.java View File

@@ -226,7 +226,7 @@ public class ActivationService {
final Map<CrudOperation, Collection<Identifiable>> objects
= modelSetupService.setupModel(api, account, "manifest-defaults");
log.info("bootstrapThisNode: created default objects\n"+json(objects));
});
}, "ActivationService.bootstrapThisNode.createDefaultObjects");
}

return node;


+ 1
- 1
bubble-server/src/main/java/bubble/service/boot/StandardSelfNodeService.java View File

@@ -161,7 +161,7 @@ public class StandardSelfNodeService implements SelfNodeService {
.booleanValue()) {
deviceDAO.refreshVpnUsers();
}
});
}, "StandardSelfNodeService.onStart.spareDevices");
}

// start RefundService if payments are enabled and this is a SageLauncher


+ 2
- 2
bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java View File

@@ -209,7 +209,7 @@ public class NodeProgressMeter extends PipedOutputStream implements Runnable {
.setAccount(nn.getAccount())
.setMessageKey(METER_COMPLETED_OK)
.setPercent(100));
background(this::close);
background(this::close, "NodeProgressMeter.completed");
}

public NodeProgressMeter uncloseable() throws IOException {
@@ -225,7 +225,7 @@ public class NodeProgressMeter extends PipedOutputStream implements Runnable {
.setAccount(nn.getAccount())
.setMessageKey(METER_ERROR_CANCELED)
.setPercent(0));
background(this::close);
background(this::close, "NodeProgressMeter.cancel");
}

private class UncloseableNodeProgressMeter extends NodeProgressMeter {


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

@@ -883,7 +883,7 @@ public class StandardNetworkService implements NetworkService {
} finally {
if (lock != null) unlockNetwork(networkUuid, lock);
}
});
}, "StandardNetworkService.stopNetwork");
return true;
}



+ 1
- 1
bubble-server/src/main/java/bubble/service/dbfilter/DatabaseFilterService.java View File

@@ -114,7 +114,7 @@ public class DatabaseFilterService {
? new FullEntityIterator(configuration, network, readerError)
: new FilteredEntityIterator(configuration, account, network, node, planApps, readerError);
}
}.runInBackground(readerError::set);
}.runInBackground("RekeyReaderMain.reader", readerError::set);

// start a RekeyWriter to pull objects from RekeyReader
final AtomicReference<CommandResult> writeResult = new AtomicReference<>();


+ 1
- 1
bubble-server/src/main/java/bubble/service/dbfilter/EntityIterator.java View File

@@ -51,7 +51,7 @@ public abstract class EntityIterator implements Iterator<Identifiable> {

public EntityIterator(AtomicReference<Exception> error) {
this.error = error;
this.thread = background(this::_iterate, this.error::set);
this.thread = background(this::_iterate, "EntityIterator", this.error::set);
}

@Override public boolean hasNext() {


+ 1
- 1
utils/cobbzilla-utils

@@ -1 +1 @@
Subproject commit df29b42b97be4387787e31139f0723a8c3a189ce
Subproject commit c66f9e167ca32887374ec07a05fd3bddaeb8c2d5

Loading…
Cancel
Save