From b7e14789911e874fd524c9b2d585ac417cf14234 Mon Sep 17 00:00:00 2001 From: Carlos <28845529+mesacarlos@users.noreply.github.com> Date: Sat, 22 Feb 2020 18:06:26 +0100 Subject: [PATCH] Implemented READLOGFILE client-side --- client/index.html | 18 ++++++---- client/scripts/WebConsole.js | 4 +++ client/scripts/WebConsoleConnector.js | 1 + client/scripts/WebConsoleJqueryHandler.js | 9 +++++ client/scripts/WebConsoleLanguage.js | 34 ++++--------------- client/scripts/WebConsoleManager.js | 7 ++++ .../scripts/WebConsolePersistenceManager.js | 4 ++- 7 files changed, 42 insertions(+), 35 deletions(-) diff --git a/client/index.html b/client/index.html index 960e3c8..365ca94 100644 --- a/client/index.html +++ b/client/index.html @@ -230,6 +230,10 @@ +
+ + +
@@ -241,7 +245,7 @@ @@ -251,11 +255,11 @@ - - - - - - + + + + + + diff --git a/client/scripts/WebConsole.js b/client/scripts/WebConsole.js index fcdb804..2814320 100644 --- a/client/scripts/WebConsole.js +++ b/client/scripts/WebConsole.js @@ -57,6 +57,10 @@ function onWebSocketsMessage(message){ case 200: //Processed writeToWebConsole(message.message); + if(connectionManager.activeConnection.isLogged === false){ + connectionManager.activeConnection.isLogged = true; + connectionManager.askForLogs(); + } break; case 400: //Unknown Command diff --git a/client/scripts/WebConsoleConnector.js b/client/scripts/WebConsoleConnector.js index 6602fab..005abe6 100644 --- a/client/scripts/WebConsoleConnector.js +++ b/client/scripts/WebConsoleConnector.js @@ -13,6 +13,7 @@ class WebConsoleConnector { this.messages = []; //All messages retrieved since connection start this.commands = []; //EXEC Commands sent by user to this server this.players = []; //Connected users. + this.isLogged = false; //Is logged in with valid pasword or not } /** diff --git a/client/scripts/WebConsoleJqueryHandler.js b/client/scripts/WebConsoleJqueryHandler.js index 7dc278a..ae550ea 100644 --- a/client/scripts/WebConsoleJqueryHandler.js +++ b/client/scripts/WebConsoleJqueryHandler.js @@ -195,6 +195,7 @@ $("#disconnectionModalWelcomeScreenButton").click(function() { $("#settingsLink").click(function() { //Update modal switches and boxes with saved settings $("#showDateSettingsSwitch").prop("checked", persistenceManager.getSetting("dateTimePrefix")); + $("#readLogFileSwitch").prop("checked", persistenceManager.getSetting("retrieveLogFile")); }); /** @@ -203,4 +204,12 @@ $("#settingsLink").click(function() { $("#showDateSettingsSwitch").click(function() { //Update modal switches and boxes with saved settings persistenceManager.setSetting("dateTimePrefix", $("#showDateSettingsSwitch").is(":checked")); +}); + +/** +* On readLogFileSwitch switched +*/ +$("#readLogFileSwitch").click(function() { + //Update modal switches and boxes with saved settings + persistenceManager.setSetting("retrieveLogFile", $("#readLogFileSwitch").is(":checked")); }); \ No newline at end of file diff --git a/client/scripts/WebConsoleLanguage.js b/client/scripts/WebConsoleLanguage.js index f78a377..b01bb69 100644 --- a/client/scripts/WebConsoleLanguage.js +++ b/client/scripts/WebConsoleLanguage.js @@ -38,6 +38,7 @@ function setLanguage(locale){ "settingsLink": "Settings", "settingsModalLongTitle": "WebConsole Settings", "showDateSettingsSwitchLabel": "Show date and time on each console line", + "readLogFileSwitchLabel": "Retrieve full log file from server after login", "settingsModalCloseButton": "Done", "players_online": "Players Online", "cpu_title": "CPU", @@ -75,6 +76,7 @@ function setLanguage(locale){ "settingsLink": "Configuración", "settingsModalLongTitle": "Configuración de WebConsole", "showDateSettingsSwitchLabel": "Mostrar fecha y hora en cada linea de consola", + "readLogFileSwitchLabel": "Leer log completo al iniciar sesión", "settingsModalCloseButton": "Hecho", "players_online": "Jugadores en línea", "cpu_title": "CPU", @@ -112,6 +114,7 @@ function setLanguage(locale){ "settingsLink": "настройки", "settingsModalLongTitle": "настройки WebConsole", "showDateSettingsSwitchLabel": "Показать дату и время в каждой строке консоли", + "readLogFileSwitchLabel": "Получить полный файл журнала с сервера после входа в систему", "settingsModalCloseButton": "Выполнено", "players_online": "Игроки", "cpu_title": "CPU", @@ -149,6 +152,7 @@ function setLanguage(locale){ "settingsLink": "Configurações", "settingsModalLongTitle": "Configurações do WebConsole", "showDateSettingsSwitchLabel": "Mostrar data e hora em cada linha do console", + "readLogFileSwitchLabel": "Recuperar arquivo de log completo do servidor após o login", "settingsModalCloseButton": "Feito", "players_online": "Jogadores online", "cpu_title": "Consumo de CPU", @@ -186,6 +190,7 @@ function setLanguage(locale){ "settingsLink": "设定值", "settingsModalLongTitle": "WebConsole 设定值", "showDateSettingsSwitchLabel": "在每个控制台行上显示日期和时间", + "readLogFileSwitchLabel": "登录后从服务器检索完整的日志文件", "settingsModalCloseButton": "完成", "players_online": "在线人数", "cpu_title": "CPU", @@ -223,6 +228,7 @@ function setLanguage(locale){ "settingsLink": "Réglages", "settingsModalLongTitle": "Réglages de WebConsole", "showDateSettingsSwitchLabel": "Afficher la date et l'heure sur chaque ligne de console", + "readLogFileSwitchLabel": "Récupérer le fichier journal complet du serveur après la connexion", "settingsModalCloseButton": "Terminé", "players_online": "Joueurs en ligne", "cpu_title": "Utilisation de la CPU", @@ -260,6 +266,7 @@ function setLanguage(locale){ "settingsLink": "Nastavení", "settingsModalLongTitle": "Nastavení WebConsole", "showDateSettingsSwitchLabel": "Zobrazit datum a čas na každé řádce konzoly", + "readLogFileSwitchLabel": "Po přihlášení načtěte úplný soubor protokolu ze serveru", "settingsModalCloseButton": "Hotovo", "players_online": "Počet hráčů online", "cpu_title": "CPU", @@ -281,31 +288,4 @@ function setLanguage(locale){ } }); - // document.getElementById("navbarHomeLink").textContent = lang.navbarHomeLink; - // document.getElementById("home_header").textContent = lang.home_header; - // document.getElementById("home_description").textContent = lang.home_description; - // document.getElementById("serversDropdown").textContent = lang.serversDropdown; - // document.getElementById("add_server").textContent = lang.add_server; - // document.getElementById("lang_dropdown").textContent = lang.lang_dropdown; - // document.getElementById("addServerModalLongTitle").textContent = lang.addServerModalLongTitle; - // document.getElementById("addServerModalSvName").textContent = lang.addServerModalSvName; - // document.getElementById("addServerModalSvIp").textContent = lang.addServerModalSvIp; - // document.getElementById("addServerModalSvPort").textContent = lang.addServerModalSvPort; - // document.getElementById("addServerModalSvSsl").textContent = lang.addServerModalSvSsl; - // document.getElementById("addServerModalSslAdvice").textContent = lang.addServerModalSslAdvice; - // document.getElementById("addServerModalClose").textContent = lang.addServerModalClose; - // document.getElementById("saveAndConnectServerButton").textContent = lang.saveAndConnectServerButton; - // document.getElementById("passwordModalLongTitle").textContent = lang.passwordModalLongTitle; - // document.getElementById("passwordModalLabel").textContent = lang.passwordModalLabel; - // document.getElementById("passwordModalRememberLabel").textContent = lang.passwordModalRememberLabel; - // document.getElementById("passwordModalCloseButton").textContent = lang.passwordModalCloseButton; - // document.getElementById("passwordSendButton").textContent = lang.passwordSendButton; - // document.getElementById("disconnectionModalLongTitle").textContent = lang.disconnectionModalLongTitle; - // document.getElementById("disconnectionModalDescription").textContent = lang.disconnectionModalDescription; - // document.getElementById("disconnectionModalCloseButton").textContent = lang.disconnectionModalCloseButton; - // document.getElementById("players_online").textContent = lang.players_online; - // document.getElementById("cpu_title").textContent = lang.cpu_title; - // document.getElementById("ram_title").textContent = lang.ram_title; - // document.getElementById("deleteServerButton").textContent = lang.deleteServerButton; - // document.getElementById("sendCommandButton").textContent = lang.sendCommandButton; } \ No newline at end of file diff --git a/client/scripts/WebConsoleManager.js b/client/scripts/WebConsoleManager.js index 86b746e..7aea278 100644 --- a/client/scripts/WebConsoleManager.js +++ b/client/scripts/WebConsoleManager.js @@ -79,5 +79,12 @@ class WebConsoleManager { this.activeConnection.sendToServer("CPUUSAGE"); this.activeConnection.sendToServer("RAMUSAGE"); } + + /** + * Asks server for full latest.log + */ + askForLogs(){ + this.activeConnection.sendToServer("READLOGFILE"); + } } \ No newline at end of file diff --git a/client/scripts/WebConsolePersistenceManager.js b/client/scripts/WebConsolePersistenceManager.js index 40d6317..5417dcf 100644 --- a/client/scripts/WebConsolePersistenceManager.js +++ b/client/scripts/WebConsolePersistenceManager.js @@ -135,8 +135,10 @@ class WebConsolePersistenceManager{ currentSettings = new Object(); } + //Setting array initialization. If you need to add more settings, add them here. Any object is valid as a value (not only bool) var settings = { - dateTimePrefix : new Setting("dateTimePrefix", true) + dateTimePrefix : new Setting("dateTimePrefix", true), + retrieveLogFile : new Setting("retrieveLogFile", true) } //Set settings