From 88b72a13f37e2cd93536fa8599c2e751829fe67c Mon Sep 17 00:00:00 2001 From: Gravit Date: Sun, 17 Feb 2019 18:48:26 +0700 Subject: [PATCH 1/2] =?UTF-8?q?[HOTFIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20ExecCommand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launchserver/response/admin/ExecCommandResponse.java | 6 +++--- .../src/main/java/ru/gravit/launchserver/socket/Client.java | 2 +- .../socket/websocket/json/admin/AddLogListenerResponse.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java index e47be8ba..be4114e5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java @@ -22,15 +22,15 @@ public void reply() throws Exception { requestError("Access denied"); writeNoError(output); String cmd = input.readString(SerializeLimits.MAX_COMMAND); - LogHelper.Output loutput = message -> { + LogHelper.OutputEnity loutput = new LogHelper.OutputEnity(message -> { try { output.writeBoolean(true); output.writeString(message, SerializeLimits.MAX_COMMAND); } catch (IOException e) { LogHelper.error(e); } - }; - LogHelper.addOutput(loutput, LogHelper.OutputTypes.PLAIN); + }, LogHelper.OutputTypes.PLAIN); + LogHelper.addOutput(loutput); try { server.commandHandler.eval(cmd, false); output.writeBoolean(false); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java index 74deb416..81ca8be4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java @@ -14,7 +14,7 @@ public class Client { public boolean checkSign; public ClientPermissions permissions; public String username; - public LogHelper.Output logOutput; + public LogHelper.OutputEnity logOutput; public Client(long session) { this.session = session; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java index f507a7e8..f2ad8c38 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java @@ -43,8 +43,8 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client LogHelper.info("Client %s remove log listener", client.username); } }; - client.logOutput = output; - LogHelper.addOutput(output, outputType); + client.logOutput = new LogHelper.OutputEnity(output,outputType); + LogHelper.addOutput(client.logOutput); } } } From ecae747b6434ee656c46b4cf85993670400f6e67 Mon Sep 17 00:00:00 2001 From: Gravit Date: Sun, 17 Feb 2019 18:48:48 +0700 Subject: [PATCH 2/2] [ANY] 4.3.3b2 --- libLauncher/src/main/java/ru/gravit/launcher/Launcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java b/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java index 56a65819..4aba4d31 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java @@ -61,7 +61,7 @@ public final class Launcher { public static final int MAJOR = 4; public static final int MINOR = 3; public static final int PATCH = 3; - public static final int BUILD = 1; + public static final int BUILD = 2; public static final Version.Type RELEASE = Version.Type.STABLE; public static GsonBuilder gsonBuilder; public static Gson gson;