Imrpoved Redeploy System

MoonTM-GIT · MoonTM-GIT · commit bc9934647892 · 2022-07-26T14:06:54.000+02:00
diff --git a/src/main/java/net/javadiscord/javabot/data/config/SystemsConfig.java b/src/main/java/net/javadiscord/javabot/data/config/SystemsConfig.java
@@ -36,6 +36,12 @@ public class SystemsConfig {
 	 */
 	private int asyncPoolSize = 4;
 
+
+	/**
+	 * The location of some sort of bash script that re-compiles a new version of the Bot.
+	 */
+	private String redeployScriptLocation = "";
+
 	/**
 	 * Configuration for the Hikari connection pool that's used for the bot's
 	 * SQL data source.
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/RedeployCommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/RedeployCommand.java
@@ -7,15 +7,16 @@
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.util.Checks;
+import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * <h3>This class represents the /redeploy command.</h3>
  * Command that lets staff-members redeploy the bot.
  * <p>
- * This only works if the way the bot is hosted is set up correctly, for example with a bash script that handles
- * compilation and a service set up with that bash script running before the bot gets started.
+ * This only works if the way the bot is hosted is set up correctly with a bash script that handles
+ * compilation and a service set up that automatically restarts the Bot..
  * <p>
  * I have explained how we do it in https://github.com/Java-Discord/JavaBot/pull/195
  */
@@ -39,7 +40,21 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			return;
 		}
 		log.warn("Redeploying... Requested by: " + event.getUser().getAsTag());
-		event.reply("**Redeploying...** This may take some time.").queue();
+		event.reply("Redeploying, this may take a few minutes.").queue();
+		try {
+			Process p = new ProcessBuilder("/bin/sh", Bot.config.getSystems().getRedeployScriptLocation()).start();
+			p.waitFor();
+			String result = new String(p.getInputStream().readAllBytes());
+			if (result.contains("COMPILATION FAILED")) {
+				event.getHook().sendMessage("Compilation failed, redeploy canceled.").queue();
+				log.warn("Redeploy canceled due to compilation error.");
+				return;
+			} else {
+				event.getHook().sendMessage("Compilation successful, restarting...").queue();
+			}
+		} catch (Exception e) {
+			ExceptionLogger.capture(e, getClass().getSimpleName());
+		}
 		Bot.messageCache.synchronize();
 		System.exit(0);
 	}
