Uplandustries/WebConsole-Client-v2.4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented READLOGFILE server-side

Browse Source
This commit is contained in:
Carlos 2020-02-22 17:33:20 +01:00
parent a54230b035
commit 8ebac6a33d
13 changed files with 83 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/scripts/WebConsole.js
View File

@ -155,7 +155,7 @@ function writeToWebConsole(msg){
//Append datetime if enabled
if(persistenceManager.getSetting("dateTimePrefix"))
msg = "[" + new Date().toLocaleString() + "] " + msg;
msg = "[" + new Date().toLocaleTimeString() + "] " + msg;
$("#consoleTextArea").append(msg + "<br>");

7
phrases.properties
View File

@ -20,7 +20,7 @@ cpu-usage-message = Usage is {0}%
# ExecCommand.java
cmd-executed-console = [WebConsole] {0} executed "{1}".
#LogInCommand.java
# LogInCommand.java
login-sucessful-message = Logged in
login-sucessful-console = [WebConsole] Successfully logged in from {0}
login-failed-message = Incorrect password, try again
@ -35,4 +35,7 @@ ram-usage-message = {0} free, {1} used, {2} maximum memory
# WebConsoleCommand.java
webconsole-version = WebConsole version {0}.
webconsole-no-connections = There are no logged in WebConsole connections now.
webconsole-active-connections = Connected to WebConsole from:
webconsole-active-connections = Connected to WebConsole from:
# ReadLogFileCommand.java
log-read-error = Error trying to read latest.log file

5
phrases_cs.properties
View File

@ -35,4 +35,7 @@ ram-usage-message = {0} volné, {1} použité, {2} maximální paměti
# WebConsoleCommand.java
webconsole-version = WebConsole verze {0}.
webconsole-no-connections = Nejsou žádné WebConsole připojení.
webconsole-active-connections = Připojeno k WebConsole z:
webconsole-active-connections = Připojeno k WebConsole z:
# ReadLogFileCommand.java
log-read-error = Chyba při čtení souboru latest.log

5
phrases_en.properties
View File

@ -35,4 +35,7 @@ ram-usage-message = {0} free, {1} used, {2} maximum memory
# WebConsoleCommand.java
webconsole-version = WebConsole version {0}.
webconsole-no-connections = There are no logged in WebConsole connections now.
webconsole-active-connections = Connected to WebConsole from:
webconsole-active-connections = Connected to WebConsole from:
# ReadLogFileCommand.java
log-read-error = Error trying to read latest.log file

7
phrases_es.properties
View File

@ -20,7 +20,7 @@ cpu-usage-message = En uso {0}%
# ExecCommand.java
cmd-executed-console = [WebConsole] {0} ejecutó "{1}".
#LogInCommand.java
# LogInCommand.java
login-sucessful-message = Sesión iniciada
login-sucessful-console = [WebConsole] Sesión iniciada con éxito desde {0}
login-failed-message = Contraña incorrecta, inténtalo de nuevo
@ -35,4 +35,7 @@ ram-usage-message = Memoria: {0} libre, {1} usada, {2} maxima
# WebConsoleCommand.java
webconsole-version = WebConsole version {0}.
webconsole-no-connections = No hay ninguna conexión activa a WebConsole en este momento.
webconsole-active-connections = Conectado a WebConsole desde:
webconsole-active-connections = Conectado a WebConsole desde:
# ReadLogFileCommand.java
log-read-error = Error leyendo el fichero latest.log

5
phrases_fr.properties
View File

@ -35,4 +35,7 @@ ram-usage-message = {0} gratuit, {1} utilisé, {2} mémoire maximale
# WebConsoleCommand.java
webconsole-version = version WebConsole {0}.
webconsole-no-connections = Aucune connexion WebConsole n'est connectée maintenant.
webconsole-active-connections = Connecté à WebConsole depuis:
webconsole-active-connections = Connecté à WebConsole depuis:
# ReadLogFileCommand.java
log-read-error = Erreur lors de la lecture du fichier latest.log

7
phrases_pt.properties
View File

@ -20,7 +20,7 @@ cpu-usage-message = Consumindo {0}%
# ExecCommand.java
cmd-executed-console = [WebConsole] {0} executou "{1}".
#LogInCommand.java
# LogInCommand.java
login-sucessful-message = Você foi autênticado.
login-sucessful-console = [WebConsole] {0} acabou de se conectar.
login-failed-message = Senha incorreta, porfavor, contate algum responsável.
@ -35,4 +35,7 @@ ram-usage-message = Disponível: {0}, Consumo de RAM: {1} / {2}
# WebConsoleCommand.java
webconsole-version = WebConsole versão {0}.
webconsole-no-connections = Atualmente não tem nenhum usuário conectado.
webconsole-active-connections = Atualmente temos:
webconsole-active-connections = Atualmente temos:
# ReadLogFileCommand.java
log-read-error = Erro ao ler o arquivo latest.log

7
phrases_ru.properties
View File

@ -20,7 +20,7 @@ cpu-usage-message = Использование {0}%
# ExecCommand.java
cmd-executed-console = [WebConsole] {0} выполнил "{1}".
#LogInCommand.java
# LogInCommand.java
login-sucessful-message = Войти в систему
login-sucessful-console = [WebConsole] Успешно вошел в систему с {0}
login-failed-message = Неверный пароль, попробуйте еще раз
@ -35,4 +35,7 @@ ram-usage-message = {0} свободно, {1} используется, {2} ма
# WebConsoleCommand.java
webconsole-version = Версия WebConsole {0}.
webconsole-no-connections = В настоящее время нет подключений к WebConsole.
webconsole-active-connections = Подключен к веб-консоли из :
webconsole-active-connections = Подключен к веб-консоли из :
# ReadLogFileCommand.java
log-read-error = ошибка чтения последнего latest.log

7
phrases_zh.properties
View File

@ -20,7 +20,7 @@ cpu-usage-message = 已使用 {0}%
# ExecCommand.java
cmd-executed-console = [網站控制台] {0} 執行 '{1}'.
#LogInCommand.java
# LogInCommand.java
login-sucessful-message = 登錄
login-sucessful-console = [網站控制台] 成功登錄 {0}
login-failed-message = 密碼不正確，請重試
@ -35,4 +35,7 @@ ram-usage-message = 空閒{0} , 已使用{1} , 最大內存{2}
# WebConsoleCommand.java
webconsole-version = 網站控制台版本 {0}.
webconsole-no-connections = 現在沒有連接登錄網站控制台。
webconsole-active-connections = 從以下位置連接到網站控制台：
webconsole-active-connections = 從以下位置連接到網站控制台：
# ReadLogFileCommand.java
log-read-error = 读取Latest.log文件时出错

2
plugin.yml
View File

@ -1,7 +1,7 @@
name: WebConsole
main: com.mesacarlos.webconsole.WebConsole
api-version: 1.13
version: 1.4
version: 1.5
description: WebSockets-based web console
author: Carlos Mesa
commands:

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>WebConsole</groupId>
<artifactId>WebConsole</artifactId>
<version>1.4</version>
<version>1.5</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>

1
src/com/mesacarlos/webconsole/websocket/command/CommandFactory.java
View File

@ -11,6 +11,7 @@ public class CommandFactory {
commands.put("PLAYERS", new PlayersCommand());
commands.put("CPUUSAGE", new CpuUsageCommand());
commands.put("RAMUSAGE", new RamUsageCommand());
commands.put("READLOGFILE", new ReadLogFileCommand());
return commands;
}
}

42
src/com/mesacarlos/webconsole/websocket/command/ReadLogFileCommand.java Normal file
View File

@ -0,0 +1,42 @@
package com.mesacarlos.webconsole.websocket.command;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Bukkit;
import org.java_websocket.WebSocket;
import com.mesacarlos.webconsole.util.Internationalization;
import com.mesacarlos.webconsole.websocket.WSServer;
import com.mesacarlos.webconsole.websocket.response.ConsoleOutput;
public class ReadLogFileCommand implements WSCommand{
@Override
public void execute(WSServer wsServer, WebSocket conn, String params) {
String log = null;
try {
log = new String(Files.readAllBytes(Paths.get("logs/latest.log")), StandardCharsets.UTF_8);
List<Character> newLineChars = Arrays.asList('\n', '\r');
while(newLineChars.contains(log.charAt(log.length()-1)))
log = log.substring(0, log.length() - 1);
} catch (IOException e) {
e.printStackTrace();
}
if(log == null) {
Bukkit.getLogger().info(Internationalization.getPhrase("log-read-error"));
return;
}
wsServer.sendToClient(conn,
new ConsoleOutput(log)
);
}
}