Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Перезагрузка конфига LaunchServer'а без его рестарта

Browse source
This commit is contained in:
Gravit 2019-03-10 19:28:22 +07:00
parent 6c59b86779
commit 24b8227685
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
7 changed files with 69 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,22 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.zip.CRC32;
public final class LaunchServer implements Runnable {
public final class LaunchServer implements Runnable, AutoCloseable, Reloadable {
@Override
public void reload() throws Exception {
config.close();
LogHelper.info("Reading LaunchServer config file");
try (BufferedReader reader = IOHelper.newReader(configFile)) {
config = Launcher.gson.fromJson(reader, Config.class);
}
config.verify();
Launcher.applyLauncherEnv(config.env);
for (AuthProvider provider : config.authProvider) {
provider.init();
}
config.authHandler.init();
}
public static final class Config {
public int port;
@ -170,6 +185,34 @@ public void verify() {
throw new NullPointerException("Netty must not be null");
}
}
public void close()
{
try {
authHandler.close();
} catch (IOException e) {
LogHelper.error(e);
}
try {
for (AuthProvider p : authProvider) p.close();
} catch (IOException e) {
LogHelper.error(e);
}
try {
textureProvider.close();
} catch (IOException e) {
LogHelper.error(e);
}
try {
hwidHandler.close();
} catch (Exception e) {
LogHelper.error(e);
}
try {
permissionsHandler.close();
} catch (Exception e) {
LogHelper.error(e);
}
}
}
public static class ExeConf {
@ -269,7 +312,7 @@ public static void main(String... args) throws Throwable {
public final Path profilesDir;
// Server config
public final Config config;
public Config config;
public final RSAPublicKey publicKey;
@ -417,6 +460,7 @@ public LaunchServer(Path dir, String[] args) throws IOException, InvalidKeySpecE
authHookManager = new AuthHookManager();
GarbageManager.registerNeedGC(sessionManager);
GarbageManager.registerNeedGC(limiter);
reloadManager.registerReloadable("launchServer", this);
if (config.permissionsHandler instanceof Reloadable)
reloadManager.registerReloadable("permissionsHandler", (Reloadable) config.permissionsHandler);
if (config.authHandler instanceof Reloadable)
@ -521,22 +565,7 @@ public void close() {
serverSocketHandler.close();
// Close handlers & providers
try {
config.authHandler.close();
} catch (IOException e) {
LogHelper.error(e);
}
try {
for (AuthProvider p : config.authProvider) p.close();
} catch (IOException e) {
LogHelper.error(e);
}
try {
config.textureProvider.close();
} catch (IOException e) {
LogHelper.error(e);
}
config.hwidHandler.close();
config.close();
modulesManager.close();
// Print last message before death :(
LogHelper.info("LaunchServer stopped");

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDHandler.java
View file

@ -38,7 +38,7 @@ public void check(HWID hwid, String username) throws HWIDException {
public abstract void check0(HWID hwid, String username) throws HWIDException;
@Override
public abstract void close();
public abstract void close() throws Exception;
public abstract List<HWID> getHwid(String username) throws HWIDException;

5
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java
View file

@ -13,4 +13,9 @@ public ClientPermissions getPermissions(String username) {
permissions.canAdmin = isAdmin;
return permissions;
}
@Override
public void close() {
}
}

5
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java
View file

@ -7,4 +7,9 @@ public class DefaultPermissionsHandler extends PermissionsHandler {
public ClientPermissions getPermissions(String username) {
return ClientPermissions.DEFAULT;
}
@Override
public void close() throws Exception {
}
}

5
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java
View file

@ -33,6 +33,11 @@ public void reload() {
}
}
@Override
public void close() throws Exception {
}
public static class Enity {
public String username;
public ClientPermissions permissions;

5
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java
View file

@ -34,6 +34,11 @@ public void reload() {
}
}
@Override
public void close() throws Exception {
}
public static class Enity {
public String username;
public ClientPermissions permissions;

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/PermissionsHandler.java
View file

@ -7,7 +7,7 @@
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
public abstract class PermissionsHandler {
public abstract class PermissionsHandler implements AutoCloseable {
private static final Map<String, Class<? extends PermissionsHandler>> PERMISSIONS_HANDLERS = new ConcurrentHashMap<>(4);
private static boolean registredHandl = false;