From e462263e0c4b30fcb855fe561b5fcd9d7866dd44 Mon Sep 17 00:00:00 2001 From: Gxorge Date: Tue, 23 May 2023 00:04:51 +0100 Subject: [PATCH] table checks + task timer 1m -> 10s --- .../hotten/staffog/data/DatabaseManager.java | 40 ++++++++++++++++++- .../uk/hotten/staffog/tasks/TaskManager.java | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/hotten/staffog/data/DatabaseManager.java b/src/main/java/uk/hotten/staffog/data/DatabaseManager.java index 3c35fa2..304fec2 100644 --- a/src/main/java/uk/hotten/staffog/data/DatabaseManager.java +++ b/src/main/java/uk/hotten/staffog/data/DatabaseManager.java @@ -35,6 +35,8 @@ public class DatabaseManager { checkWebTable(); checkLinkCodeTable(); checkStaffIpTable(); + checkAuditTable(); + checkAppealTable(); } public Connection createConnection() throws SQLException, ClassNotFoundException { @@ -325,7 +327,7 @@ public class DatabaseManager { private void checkAuditTable() { try (Connection connection = createConnection()) { DatabaseMetaData meta = connection.getMetaData(); - ResultSet resultSet = meta.getTables(null, null, "staffog_staffip", new String[] {"TABLE"}); + ResultSet resultSet = meta.getTables(null, null, "staffog_audit", new String[] {"TABLE"}); if (resultSet.next()) { return; @@ -349,4 +351,40 @@ public class DatabaseManager { e.printStackTrace(); } } + + private void checkAppealTable() { + try (Connection connection = createConnection()) { + DatabaseMetaData meta = connection.getMetaData(); + ResultSet resultSet = meta.getTables(null, null, "staffog_appeal", new String[] {"TABLE"}); + + if (resultSet.next()) { + return; + } + + // Table does not exist + Statement statement = connection.createStatement(); + + String sql = "CREATE TABLE `staffog_appeal` (" + + " `id` int(11) NOT NULL AUTO_INCREMENT," + + " `uuid` varchar(36) NOT NULL," + + " `time` bigint(20) NOT NULL," + + " `type` varchar(128) NOT NULL," + + " `pid` int(11) NOT NULL," + + " `reason` varchar(2048) NOT NULL," + + " `open` bit(1) NOT NULL DEFAULT b'1'," + + " `assigned` varchar(36) DEFAULT NULL," + + " `verdict` bit(1) DEFAULT NULL," + + " `verdict_time` bigint(20) DEFAULT NULL," + + " `comment` varchar(2048) DEFAULT NULL," + + " PRIMARY KEY (`id`)" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"; + + statement.executeUpdate(sql); + Console.info("Created 'staffog_appeal' table, was missing."); + + } catch (Exception e) { + Console.error("Failed to check 'staffog_appeal' table."); + e.printStackTrace(); + } + } } diff --git a/src/main/java/uk/hotten/staffog/tasks/TaskManager.java b/src/main/java/uk/hotten/staffog/tasks/TaskManager.java index 7d7d9ae..8e962c5 100644 --- a/src/main/java/uk/hotten/staffog/tasks/TaskManager.java +++ b/src/main/java/uk/hotten/staffog/tasks/TaskManager.java @@ -32,7 +32,7 @@ public class TaskManager { } } } - }, 0, 1200); + }, 0, 200); } private ArrayList checkForTasks() {