JfMods/Inceptum
1
0
Fork 0
Code Issues 2 Packages Projects Releases Activity

chore: clean up some leftovers
Some checks failed
ci/woodpecker/push/docs Pipeline is pending
Details
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2024-06-29 20:24:45 +02:00
parent fabe5afed0
commit ad62ab6591
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/flow/FlowMds.java
View File

@ -9,8 +9,7 @@ import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta;
import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath;
import io.gitlab.jfronny.inceptum.launcher.system.mds.*;
import io.gitlab.jfronny.inceptum.launcher.system.mds.noop.NoopMod;
import io.gitlab.jfronny.inceptum.launcher.util.GameVersionParser;
import io.gitlab.jfronny.inceptum.launcher.util.VoidClaimPool;
import io.gitlab.jfronny.inceptum.launcher.util.*;
import java.io.IOException;
import java.nio.file.*;
@ -163,7 +162,7 @@ public class FlowMds implements ModsDirScanner {
}
}
private final HashMap<String, MdsRetryState> timeouts = new HashMap<>();
private final HashMap<String, ExponentialBackoff> timeouts = new HashMap<>();
private void performScanTask(Map<ScanStage, ThrowingBiConsumer<Path, Mod, IOException>> discovered) throws IOException {
if (!Files.isDirectory(instance.modsDir())) {
return;
@ -200,7 +199,6 @@ public class FlowMds implements ModsDirScanner {
Utils.LOGGER.error("Could not scan file for mod info", e);
}
}
runOnce(ScanStage.ALL, R::nop);
}
private Set<Path> getToScan() throws IOException {

7
launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/flow/MdsDiscoverTask.java
View File

@ -7,13 +7,14 @@ import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta;
import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath;
import io.gitlab.jfronny.inceptum.launcher.system.mds.*;
import io.gitlab.jfronny.inceptum.launcher.system.mds.noop.NoopMod;
import io.gitlab.jfronny.inceptum.launcher.util.ExponentialBackoff;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
public record MdsDiscoverTask(HashMap<String, MdsRetryState> timeouts, ProtoInstance instance, String gameVersion) implements ThrowingFunction<Path, Mod, IOException> {
public record MdsDiscoverTask(HashMap<String, ExponentialBackoff> timeouts, ProtoInstance instance, String gameVersion) implements ThrowingFunction<Path, Mod, IOException> {
@Override
public Mod apply(Path file) throws IOException {
if (!Files.exists(file)) return null;
@ -25,8 +26,8 @@ public record MdsDiscoverTask(HashMap<String, MdsRetryState> timeouts, ProtoInst
private Mod discover(Path jarPath, Path imodPath) throws IOException {
String key = imodPath.getFileName().toString() + "/" + MdsDiscoverTask.class.getTypeName();
MdsRetryState state = timeouts.computeIfAbsent(key, _ -> new MdsRetryState());
if (!state.shouldRetry()) return null;
ExponentialBackoff state = timeouts.computeIfAbsent(key, _ -> new ExponentialBackoff());
if (!state.shouldTry()) return null;
try {
ModMeta meta;
if (Files.exists(imodPath)) meta = GC_ModMeta.deserialize(imodPath, GsonPreset.CONFIG);

7
launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/flow/MdsTaskRetryWrapper.java
View File

@ -2,16 +2,17 @@ package io.gitlab.jfronny.inceptum.launcher.system.mds.flow;
import io.gitlab.jfronny.commons.throwable.ThrowingConsumer;
import io.gitlab.jfronny.inceptum.launcher.system.mds.MdsMod;
import io.gitlab.jfronny.inceptum.launcher.util.ExponentialBackoff;
import java.io.IOException;
import java.util.Map;
public record MdsTaskRetryWrapper(Map<String, MdsRetryState> timeouts, ThrowingConsumer<MdsMod, IOException> inner) implements ThrowingConsumer<MdsMod, IOException> {
public record MdsTaskRetryWrapper(Map<String, ExponentialBackoff> timeouts, ThrowingConsumer<MdsMod, IOException> inner) implements ThrowingConsumer<MdsMod, IOException> {
@Override
public void accept(MdsMod mod) throws IOException {
String key = mod.getMetadataPath().getFileName().toString() + "/" + inner.getClass().getTypeName();
MdsRetryState state = timeouts.computeIfAbsent(key, _ -> new MdsRetryState());
if (!state.shouldRetry()) return;
ExponentialBackoff state = timeouts.computeIfAbsent(key, _ -> new ExponentialBackoff());
if (!state.shouldTry()) return;
try {
inner.accept(mod);
state.success();

12
launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/flow/MdsRetryState.java → launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/util/ExponentialBackoff.java
View File

@ -1,10 +1,14 @@
package io.gitlab.jfronny.inceptum.launcher.system.mds.flow;
package io.gitlab.jfronny.inceptum.launcher.util;
public class MdsRetryState {
/**
* A simple class to manage exponential backoff.
* Used within the MDS to manage task retries.
*/
public class ExponentialBackoff {
private int retries = 0;
private long nextRetry = 0;
public boolean shouldRetry() {
public boolean shouldTry() {
return retries == 0 || System.currentTimeMillis() > nextRetry;
}
@ -13,7 +17,7 @@ public class MdsRetryState {
}
public void fail() {
retries++;
nextRetry = System.currentTimeMillis() + (1L << retries) * 1000;
retries++;
}
}

2
packaging/arch-linux

@ -1 +1 @@
Subproject commit 51000ec505afe15dafc6c9476382a302c5093fd2
Subproject commit 2159562d3cf32e48814e0913481f88e204ba27e9