Parcourir la source

install ssh key if requested, even for fork

tags/v0.1.8
Jonathan Cobb il y a 4 ans
Parent
révision
cbc55dce69
2 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. +1
    -1
      bubble-server/src/main/java/bubble/service/dbfilter/DatabaseFilterService.java
  2. +7
    -2
      bubble-server/src/main/java/bubble/service/dbfilter/FullEntityIterator.java

+ 1
- 1
bubble-server/src/main/java/bubble/service/dbfilter/DatabaseFilterService.java Voir le fichier

@@ -98,7 +98,7 @@ public class DatabaseFilterService {
@Override public RekeyOptions getOptions() { return readerOptions; }
@Override protected Iterator<Identifiable> getEntityProducer(BubbleConfiguration fromConfig, AtomicReference<Exception> error) {
return fork
? new FullEntityIterator(configuration, readerError)
? new FullEntityIterator(configuration, network, readerError)
: new FilteredEntityIterator(configuration, account, network, node, readerError);
}
}.runInBackground(readerError::set);


+ 7
- 2
bubble-server/src/main/java/bubble/service/dbfilter/FullEntityIterator.java Voir le fichier

@@ -1,5 +1,6 @@
package bubble.service.dbfilter;

import bubble.model.cloud.BubbleNetwork;
import bubble.server.BubbleConfiguration;
import lombok.extern.slf4j.Slf4j;

@@ -9,15 +10,19 @@ import java.util.concurrent.atomic.AtomicReference;
public class FullEntityIterator extends EntityIterator {

private final BubbleConfiguration config;
private final BubbleNetwork network;

public FullEntityIterator (BubbleConfiguration config, AtomicReference<Exception> error) {
public FullEntityIterator (BubbleConfiguration config,
BubbleNetwork network,
AtomicReference<Exception> error) {
super(error);
this.config = config;
this.network = network;
}

protected void iterate() {
config.getEntityClasses().forEach(c -> {
addEntities(c, config.getDaoForEntityClass(c).findAll(), null, null);
addEntities(c, config.getDaoForEntityClass(c).findAll(), network, null);
});
log.info("iterate: completed");
}


Chargement…
Annuler
Enregistrer