louis/moviequotebot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Maintenance mode can be enabled through socket calls and client/server communication works fine.

Browse Source 
Signed-off-by: Louis Vallat <louis@louis-vallat.xyz>
This commit is contained in:
Louis Vallat 2020-11-16 23:38:05 +01:00
parent 0c23268ed3
commit 9890b005fd
5 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/xyz/vallat/louis/MoviesQuoteBot.java
View File

@ -22,7 +22,7 @@ public class MoviesQuoteBot {
public static final String DESCRIPTION = "I may know quotes from movies.";
public static final String VERSION = "0.3.8-SNAPSHOT";
public static final String KILL_SWITCH_FILE = "system_locked";
public static final String MAINTENANCE_MODE_FILE = "maintenance_mode_engaged";
public static final String MAINTENANCE_MODE_FILE = "maintenance_mode_locked";
private static final Logger logger = LoggerFactory.getLogger(MoviesQuoteBot.class.getCanonicalName());
private static final Options options = new Options();
private static boolean isInMaintenanceMode = false;
@ -52,40 +52,44 @@ public class MoviesQuoteBot {
DiscordManager.logout();
}));
DiscordManager.onDisconnect();
if (new File(MAINTENANCE_MODE_FILE).exists()) {
logger.warn("Starting in maintenance mode.");
switchToMaintenanceMode();
}
DiscordManager.onDisconnect();
}
public static void switchToMaintenanceMode() {
try {
if (new File(MAINTENANCE_MODE_FILE).createNewFile())
logger.debug("Created file '{}'.", MAINTENANCE_MODE_FILE);
} catch (IOException e) {
logger.error("Couldn't create file '{}'.", MAINTENANCE_MODE_FILE);
if (!isInMaintenanceMode) {
try {
if (new File(MAINTENANCE_MODE_FILE).createNewFile())
logger.debug("Created file '{}'.", MAINTENANCE_MODE_FILE);
} catch (IOException e) {
logger.error("Couldn't create file '{}'.", MAINTENANCE_MODE_FILE);
}
isInMaintenanceMode = true;
DiscordManager.setOnMaintenanceMode();
OpenSubtitles.logout();
logger.info("Maintenance mode engaged.");
}
DiscordManager.setOnMaintenanceMode();
OpenSubtitles.logout();
logger.info("Maintenance mode engaged.");
}
public static void switchToNormalOperations() {
try {
Files.delete(Path.of(MAINTENANCE_MODE_FILE));
} catch (IOException e) {
logger.error("Could not delete file '{}'.", MAINTENANCE_MODE_FILE, e);
if (isInMaintenanceMode) {
try {
Files.delete(Path.of(MAINTENANCE_MODE_FILE));
} catch (IOException e) {
logger.error("Could not delete file '{}'.", MAINTENANCE_MODE_FILE, e);
}
isInMaintenanceMode = false;
DiscordManager.setOnline();
OpenSubtitles.login();
logger.info("Maintenance mode disengaged.");
}
isInMaintenanceMode = false;
DiscordManager.setOnline();
OpenSubtitles.login();
logger.info("Maintenance mode disengaged.");
}
public static boolean isInMaintenanceMode() {
if (!Files.exists(Path.of(MAINTENANCE_MODE_FILE)) && isInMaintenanceMode) switchToNormalOperations();
return isInMaintenanceMode;
}
@ -93,5 +97,6 @@ public class MoviesQuoteBot {
CommandsClient.checkVersions();
CommandsClient.setMaintenanceMode(true);
CommandsClient.setMaintenanceMode(false);
System.exit(0);
}
}

4
src/main/java/xyz/vallat/louis/discord/DiscordManager.java
View File

@ -47,9 +47,9 @@ public final class DiscordManager {
private static void registerDiscordCommands() {
for (Command command : commands)
discordClient.getEventDispatcher().on(MessageCreateEvent.class)
.filter(event -> !isInMaintenanceMode() && event.getMessage().getAuthor().map(user -> !user.isBot()).orElse(false))
.filter(event -> event.getMessage().getAuthor().map(user -> !user.isBot()).orElse(false))
.filter(event -> event.getMessage().getContent().split(" ")[0].equals(command.getName()))
.flatMap(event -> command.execute(event).then())
.flatMap(event -> !isInMaintenanceMode() ? command.execute(event).then() : Mono.just("").then())
.subscribe();
}

2
src/main/java/xyz/vallat/louis/sockets/CommandsClient.java
View File

@ -20,6 +20,8 @@ public class CommandsClient {
private static final String SOCKET_HOST = System.getenv(EnvironmentVariables.SOCKET_HOST.getValue()) == null ?
"localhost" : System.getenv(EnvironmentVariables.SOCKET_HOST.getValue());
private CommandsClient() {}
private static String sendMessage(String message) {
logger.debug("Sending message '{}'.", message);
try (Socket clientSocket = new Socket(SOCKET_HOST, PORT)) {

2
src/main/java/xyz/vallat/louis/sockets/CommandsServer.java
View File

@ -57,7 +57,7 @@ public class CommandsServer {
logger.error("Couldn't even create kill switch file... Exiting anyway.", e);
}
System.exit(ExitCodes.URGENT_EXIT_REQUIRED.getValue());
});
}).start();
}
private static boolean computeMessage(PrintWriter out, String message) {

2
src/main/java/xyz/vallat/louis/subtitles/OpenSubtitles.java
View File

@ -50,7 +50,7 @@ public final class OpenSubtitles {
public static void logout() {
try {
client.logout();
if (client.isLoggedIn()) client.logout();
} catch (XmlRpcException e) {
logger.error("Could not log out. Skipping.");
}