Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-04 15:31:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Вынес Timer в LaunchServer и Updater, ведь модули тоже могут его использовать.

Browse source
This commit is contained in:
zaxar163 2019-01-25 11:57:56 +03:00
parent 7abd9898c8
commit 225ff843c4
No known key found for this signature in database
GPG key ID: E3B309DD3852DE06
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -287,9 +287,9 @@ public static void main(String... args) throws Throwable {
// Updates and profiles // Updates and profiles
private volatile List<ClientProfile> profilesList; private volatile List<ClientProfile> profilesList;
public volatile Map<String, SignedObjectHolder<HashedDir>> updatesDirMap; public volatile Map<String, SignedObjectHolder<HashedDir>> updatesDirMap;
public final Timer taskPool;
public final Updater updater; public final Updater updater;
public static Gson gson; public static Gson gson;
@ -297,6 +297,7 @@ public static void main(String... args) throws Throwable {
public LaunchServer(Path dir, String[] args) throws IOException, InvalidKeySpecException { public LaunchServer(Path dir, String[] args) throws IOException, InvalidKeySpecException {
this.dir = dir; this.dir = dir;
taskPool = new Timer("Timered task worker thread", true);
launcherLibraries = dir.resolve("launcher-libraries"); launcherLibraries = dir.resolve("launcher-libraries");
if (!Files.isDirectory(launcherLibraries)) { if (!Files.isDirectory(launcherLibraries)) {
Files.deleteIfExists(launcherLibraries); Files.deleteIfExists(launcherLibraries);

5
LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java
View file

@ -6,7 +6,6 @@
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -25,12 +24,10 @@ public class Updater extends TimerTask {
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss", Locale.US); private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss", Locale.US);
private static final long period = 1000*3600; private static final long period = 1000*3600;
private static final Version VERSION = Launcher.getVersion(); private static final Version VERSION = Launcher.getVersion();
private final Timer taskPool;
private final GHRepository gravitLauncher; private final GHRepository gravitLauncher;
private Version parent = VERSION; private Version parent = VERSION;
public Updater(LaunchServer srv) { public Updater(LaunchServer srv) {
this.taskPool = new Timer("Updater thread", true);
GHRepository gravitLauncherTmp = null; GHRepository gravitLauncherTmp = null;
try { try {
@ -40,7 +37,7 @@ public Updater(LaunchServer srv) {
} }
this.gravitLauncher = gravitLauncherTmp; this.gravitLauncher = gravitLauncherTmp;
run(); run();
if (srv.config.updatesNotify) taskPool.schedule(this, new Date(System.currentTimeMillis()+period), period); if (srv.config.updatesNotify) srv.taskPool.schedule(this, new Date(System.currentTimeMillis()+period), period);
} }
@Override @Override