Minecon724/tweaks724
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix logging in updater

Browse source
This commit is contained in:
Minecon724 2025-01-02 12:54:08 +01:00
parent 0d87ca8f76
commit 6ad6550f5d
Signed by: Minecon724
GPG key ID: 3CCC4D267742C8E8
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/eu/m724/tweaks/updater/UpdateChecker.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2024 Minecon724 * Copyright (C) 2025 Minecon724
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file * Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
* in the project root for the full license text. * in the project root for the full license text.
*/ */
@ -19,26 +19,28 @@ import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class UpdateChecker extends BukkitRunnable { public class UpdateChecker extends BukkitRunnable {
private final Logger logger;
private final Set<VersionedResource> resources; private final Set<VersionedResource> resources;
static final Set<VersionedResource> availableUpdates = new HashSet<>(); static final Set<VersionedResource> availableUpdates = new HashSet<>();
static LocalTime lastChecked = null; static LocalTime lastChecked = null;
UpdateChecker(Set<VersionedResource> resources) { UpdateChecker(Logger logger, Set<VersionedResource> resources) {
this.logger = logger;
this.resources = resources; // TODO make a copy? this.resources = resources; // TODO make a copy?
} }
private void checkAll() { private void checkAll() {
//logger.info("Checking for updates"); DebugLogger.fine("Checking for updates");
lastChecked = LocalTime.now(ZoneOffset.UTC); lastChecked = LocalTime.now(ZoneOffset.UTC);
availableUpdates.clear(); availableUpdates.clear();
for (VersionedResource versionedResource : Set.copyOf(resources)) { for (VersionedResource versionedResource : Set.copyOf(resources)) {
String pluginName = versionedResource.resource().plugin().getName(); String pluginName = versionedResource.resource().plugin().getName();
//logger.info(versionedResource.resource().resourceId() + " " + versionedResource.resource().plugin().getName());
int page = versionedResource.running() != null ? versionedResource.running().page() : 1; int page = versionedResource.running() != null ? versionedResource.running().page() : 1;
try { try {
@ -46,14 +48,13 @@ public class UpdateChecker extends BukkitRunnable {
if (!versionedResource.equals(newResource)) { if (!versionedResource.equals(newResource)) {
resources.remove(versionedResource); resources.remove(versionedResource);
if (newResource.running() == null) { if (newResource.running() == null) {
DebugLogger.info("Unable to find installed version of %s".formatted(pluginName)); logger.warning("Unable to find installed version of %s".formatted(pluginName));
if (versionedResource.running() != null) { if (versionedResource.running() != null) {
DebugLogger.info("Did you downgrade %s? If so, clear cache".formatted(pluginName)); logger.warning("Did you downgrade %s? If so, clear cache".formatted(pluginName));
} }
} else { } else {
if (!newResource.running().equals(newResource.latest())) { if (!newResource.running().equals(newResource.latest())) {
availableUpdates.add(newResource); availableUpdates.add(newResource);
//logger.info("Update available for %s. %d -> %d".formatted(pluginName, newResource.running().updateId(), newResource.latest().updateId()));
} }
} }
resources.add(newResource); resources.add(newResource);
@ -67,11 +68,11 @@ public class UpdateChecker extends BukkitRunnable {
private void alert() { private void alert() {
int n = availableUpdates.size(); int n = availableUpdates.size();
if (n == 0) return; if (n == 0) return;
DebugLogger.info(Language.getString("updateAvailableNotice", n)); logger.info(Language.getString("updateAvailableNotice", n));
availableUpdates.stream() availableUpdates.stream()
.map(u -> "- %s (%s -> %s)".formatted(u.resource().name(), u.running().label(), u.latest().label())) .map(u -> "- %s (%s -> %s)".formatted(u.resource().name(), u.running().label(), u.latest().label()))
.forEach(DebugLogger::info); .forEach(logger::info);
} }
@Override @Override

2
src/main/java/eu/m724/tweaks/updater/UpdaterManager.java
View file

@ -60,7 +60,7 @@ public class UpdaterManager {
)).collect(Collectors.toSet()); )).collect(Collectors.toSet());
new UpdateChecker(versionedResources) new UpdateChecker(plugin.getLogger(), versionedResources)
.runTaskTimerAsynchronously(plugin, 600, 12 * 3600 * 20); .runTaskTimerAsynchronously(plugin, 600, 12 * 3600 * 20);
updatesCommand.setExecutor(new UpdaterCommands()); updatesCommand.setExecutor(new UpdaterCommands());