From 2841d94de6a8a6a506fe490371ef03e5a4298be4 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Sat, 17 Oct 2015 16:18:58 +0200
Subject: [PATCH] UNDERTOW-557 Undertow missing jboss logging
 internationalization

---
 core/src/main/java/io/undertow/UndertowLogger.java   | 12 ++++++++++++
 .../io/undertow/protocols/http2/Http2Channel.java    |  1 -
 .../src/main/java/io/undertow/server/Connectors.java |  2 +-
 .../io/undertow/server/handlers/JDBCLogHandler.java  |  2 +-
 .../encoding/ContentEncodedResourceManager.java      |  2 +-
 .../io/undertow/websockets/core/WebSocketUtils.java  |  3 ---
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/io/undertow/UndertowLogger.java b/core/src/main/java/io/undertow/UndertowLogger.java
index 5eb408100c..4e7ad8f5b3 100644
--- a/core/src/main/java/io/undertow/UndertowLogger.java
+++ b/core/src/main/java/io/undertow/UndertowLogger.java
@@ -19,6 +19,7 @@
 package io.undertow;
 
 import io.undertow.client.ClientConnection;
+import io.undertow.server.HttpServerExchange;
 import io.undertow.server.ServerConnection;
 import io.undertow.util.HeaderMap;
 import io.undertow.util.HttpString;
@@ -326,4 +327,15 @@ void nodeConfigCreated(URI connectionURI, String balancer, String domain, String
     @Message(id = 5068, value = "Pattern was just empty or whitespace")
     void extendedAccessLogEmptyPattern();
 
+    @LogMessage(level = ERROR)
+    @Message(id = 5069, value = "Failed to write JDBC access log")
+    void failedToWriteJdbcAccessLog(@Cause SQLException e);
+
+    @LogMessage(level = ERROR)
+    @Message(id = 5070, value = "Failed to write pre-cached file")
+    void failedToWritePreCachedFile();
+
+    @LogMessage(level = ERROR)
+    @Message(id = 5071, value = "Undertow request failed %s")
+    void undertowRequestFailed(@Cause Throwable t, HttpServerExchange exchange);
 }
diff --git a/core/src/main/java/io/undertow/protocols/http2/Http2Channel.java b/core/src/main/java/io/undertow/protocols/http2/Http2Channel.java
index d458137341..29f6c8f670 100644
--- a/core/src/main/java/io/undertow/protocols/http2/Http2Channel.java
+++ b/core/src/main/java/io/undertow/protocols/http2/Http2Channel.java
@@ -407,7 +407,6 @@ protected FrameHeaderData parseFrame(ByteBuffer data) throws IOException {
                     sb.append(data.get());
                     sb.append(" ");
                 }
-                UndertowLogger.REQUEST_IO_LOGGER.error("Buffer: " + sb.toString());
                 markReadsBroken(new IOException());
             } else {
                 initialSettingsReceived = true;
diff --git a/core/src/main/java/io/undertow/server/Connectors.java b/core/src/main/java/io/undertow/server/Connectors.java
index 6ea0010919..ce4cf6fdbb 100644
--- a/core/src/main/java/io/undertow/server/Connectors.java
+++ b/core/src/main/java/io/undertow/server/Connectors.java
@@ -218,7 +218,7 @@ public static void executeRootHandler(final HttpHandler handler, final HttpServe
             if (!exchange.isResponseStarted()) {
                 exchange.setStatusCode(StatusCodes.INTERNAL_SERVER_ERROR);
             }
-            UndertowLogger.REQUEST_LOGGER.errorf(t, "Undertow request failed %s", exchange);
+            UndertowLogger.REQUEST_LOGGER.undertowRequestFailed(t, exchange);
             exchange.endExchange();
         }
     }
diff --git a/core/src/main/java/io/undertow/server/handlers/JDBCLogHandler.java b/core/src/main/java/io/undertow/server/handlers/JDBCLogHandler.java
index d8f7915159..609ab55092 100644
--- a/core/src/main/java/io/undertow/server/handlers/JDBCLogHandler.java
+++ b/core/src/main/java/io/undertow/server/handlers/JDBCLogHandler.java
@@ -215,7 +215,7 @@ private void writeMessage(List<JDBCLogAttribute> messages) {
                         ps.executeUpdate();
                         numberOfTries = 0;
                     } catch (SQLException e) {
-                        UndertowLogger.ROOT_LOGGER.error(e);
+                        UndertowLogger.ROOT_LOGGER.failedToWriteJdbcAccessLog(e);
                     }
                     numberOfTries--;
                 }
diff --git a/core/src/main/java/io/undertow/server/handlers/encoding/ContentEncodedResourceManager.java b/core/src/main/java/io/undertow/server/handlers/encoding/ContentEncodedResourceManager.java
index e658009c2e..cbb98ca644 100644
--- a/core/src/main/java/io/undertow/server/handlers/encoding/ContentEncodedResourceManager.java
+++ b/core/src/main/java/io/undertow/server/handlers/encoding/ContentEncodedResourceManager.java
@@ -139,7 +139,7 @@ public ContentEncodedResource getResource(final Resource resource, final HttpSer
             targetChannel.shutdownWrites();
             org.xnio.channels.Channels.flushBlocking(targetChannel);
             if (transferred != resource.getContentLength()) {
-                UndertowLogger.REQUEST_LOGGER.error("Failed to write pre-cached file");
+                UndertowLogger.REQUEST_LOGGER.failedToWritePreCachedFile();
             }
             Files.move(tempTarget, finalTarget);
             encoded.invalidate(newPath);
diff --git a/core/src/main/java/io/undertow/websockets/core/WebSocketUtils.java b/core/src/main/java/io/undertow/websockets/core/WebSocketUtils.java
index 880ffe12b7..d8ae9cecba 100644
--- a/core/src/main/java/io/undertow/websockets/core/WebSocketUtils.java
+++ b/core/src/main/java/io/undertow/websockets/core/WebSocketUtils.java
@@ -328,9 +328,6 @@ public void handleEvent(final Channel channel) {
                 case 0: {
                     // read listener
                     for (; ; ) {
-                        if(buffer.hasRemaining()) {
-                            WebSocketLogger.REQUEST_LOGGER.error("BUFFER HAS REMAINING!!!!!");
-                        }
                         try {
                             lres = source.transferTo(Long.MAX_VALUE, buffer, sink);
                         } catch (IOException e) {