Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-28 21:26:01 +01:00
Code Issues Projects Releases Wiki Activity

Don't attempt reconnect while shutting down

Browse Source
This commit is contained in:
ME1312 2019-09-26 12:41:04 -04:00
parent 27806b91f9
commit a5c5a532a0
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java
View File

@ -46,7 +46,7 @@ public class PacketExDownloadTemplates implements PacketIn, PacketStreamOut {
@Override @Override
public void receive(SubDataClient client) { public void receive(SubDataClient client) {
if (client.getHandler() != null && client.getHandler() instanceof ExternalHost && plugin.config.get().getMap("Hosts").getKeys().contains(((ExternalHost) client.getHandler()).getName())) { if (client.getHandler() != null && client.getHandler() instanceof ExternalHost) {
client.sendPacket(new PacketExDownloadTemplates(plugin, (ExternalHost) client.getHandler())); client.sendPacket(new PacketExDownloadTemplates(plugin, (ExternalHost) client.getHandler()));
} }
} }

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
View File

@ -166,8 +166,10 @@ public class SubProtocol extends SubDataProtocol {
if (plugin.isEnabled()) Bukkit.getPluginManager().callEvent(event); if (plugin.isEnabled()) Bukkit.getPluginManager().callEvent(event);
map.put(0, null); map.put(0, null);
if (plugin.isEnabled()) {
Bukkit.getLogger().info("SubData > Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds"); Bukkit.getLogger().info("SubData > Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds");
Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client)); Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client));
}
}); });
return subdata; return subdata;

2
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java
View File

@ -177,9 +177,11 @@ public class SubProtocol extends SubDataProtocol {
Sponge.getEventManager().post(event); Sponge.getEventManager().post(event);
map.put(0, null); map.put(0, null);
if (Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("running"), plugin), true)) {
Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null); Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null);
log.info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds"); log.info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds");
Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client)); Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client));
}
}); });
return subdata; return subdata;

3
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
View File

@ -58,6 +58,7 @@ public final class SubPlugin {
@Inject public PluginContainer plugin; @Inject public PluginContainer plugin;
@Inject public Game game; @Inject public Game game;
private boolean running = false;
private long resetDate = 0; private long resetDate = 0;
private boolean reconnect = false; private boolean reconnect = false;
@ -97,6 +98,7 @@ public final class SubPlugin {
Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath());
} }
running = true;
subprotocol = SubProtocol.get(); subprotocol = SubProtocol.get();
reload(false); reload(false);
@ -218,6 +220,7 @@ public final class SubPlugin {
*/ */
@Listener @Listener
public void disable(GameStoppingEvent event) { public void disable(GameStoppingEvent event) {
running = false;
if (subdata != null) try { if (subdata != null) try {
reconnect = false; reconnect = false;

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java
View File

@ -163,9 +163,11 @@ public class SubProtocol extends SubDataProtocol {
host.engine.getPluginManager().executeEvent(event); host.engine.getPluginManager().executeEvent(event);
map.put(0, null); map.put(0, null);
if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) {
Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null); Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null);
log.info("Attempting reconnect in " + host.config.get().getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getInt("Reconnect", 30) + " seconds"); log.info("Attempting reconnect in " + host.config.get().getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getInt("Reconnect", 30) + " seconds");
Util.isException(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, NamedContainer.class), host, log, client)); Util.isException(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, NamedContainer.class), host, log, client));
}
}); });
return subdata; return subdata;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java
View File

@ -166,8 +166,10 @@ public class SubProtocol extends SubDataProtocol {
plugin.getPluginManager().callEvent(event); plugin.getPluginManager().callEvent(event);
map.put(0, null); map.put(0, null);
if (plugin.isRunning) {
net.ME1312.SubServers.Sync.Library.Compatibility.Logger.get("SubData").info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds"); net.ME1312.SubServers.Sync.Library.Compatibility.Logger.get("SubData").info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds");
Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client)); Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client));
}
}); });
return subdata; return subdata;