Made setup throw the new 504 if needed

plan-player-analytics · Feb 19, 2018 · e7002d7 · e7002d7
1 parent d1b12c8
commit e7002d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java
@@ -77,6 +77,8 @@ private void requestSetup(ISender sender, String address) {
                 sender.sendMessage("§eConnection failed: " + e.getMessage());
             } catch (InternalErrorException e) {
                 sender.sendMessage("§eConnection succeeded. " + e.getMessage() + ", check possible ErrorLog on receiving server's debug page.");
+            } catch (GatewayException e) {
+                sender.sendMessage("§eConnection succeeded, but Bungee failed to connect to this server. Use Connection debug commands for more.");
             } catch (WebException e) {
                 Log.toLog(this.getClass(), e);
                 sender.sendMessage("§cConnection to Bungee WebServer failed: More info in the error log.");

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SendDBSettingsRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SendDBSettingsRequest.java
@@ -6,6 +6,7 @@
 
 import com.djrapitops.plan.api.exceptions.connection.BadRequestException;
 import com.djrapitops.plan.api.exceptions.connection.ConnectionFailException;
+import com.djrapitops.plan.api.exceptions.connection.GatewayException;
 import com.djrapitops.plan.api.exceptions.connection.WebException;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.server.Server;
@@ -81,7 +82,7 @@ public Response handleRequest(Map<String, String> variables) throws WebException
         } catch (ConnectionFailException e) {
             Throwable cause = e.getCause();
             if (!(cause instanceof SocketException) || !cause.getMessage().contains("Unexpected end of file from server")) {
-                throw e;
+                throw new GatewayException(e.getMessage());
             }
         }