From f33e52c408e71b5c710d3f1f06b4e211d418486a Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Wed, 26 Oct 2016 15:25:00 -0400
Subject: Fixing "Sending an 2xx 'early' response before end of request was
 received..." for no entity requests

---
 src/main/resources/logback.xml               | 22 ----------------------
 src/main/scala/xyz/driver/core/logging.scala | 27 ++++++++++-----------------
 src/main/scala/xyz/driver/core/rest.scala    |  7 +++----
 3 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 src/main/resources/logback.xml

(limited to 'src')

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index 1b96003..0000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.out</target>
-        <encoder>
-            <pattern>%date{MM/dd HH:mm:ss} %-5level[%.15thread] %logger{1} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <logger name="slick.backend.DatabaseComponent.actio" level="debug"/>
-    <logger name="slick.jdbc" level="error" />
-    <logger name="slick.ast" level="error" />
-    <logger name="slick.memory" level="error" />
-    <logger name="slick.relational" level="error" />
-    <logger name="slick.compiler" level="error" />
-    <logger name="com.wordnik" level="error" />
-    <logger name="com.github" level="error" />
-    <root level="debug">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-
-</configuration>
diff --git a/src/main/scala/xyz/driver/core/logging.scala b/src/main/scala/xyz/driver/core/logging.scala
index 599c824..ba17131 100644
--- a/src/main/scala/xyz/driver/core/logging.scala
+++ b/src/main/scala/xyz/driver/core/logging.scala
@@ -87,7 +87,7 @@ object logging {
       scalaLogging.debug(marker, "DEBUG " + message, args)
   }
 
-  class NoLogger() extends Logger {
+  object NoLogger extends Logger {
 
     def fatal(message: String): Unit                                   = {}
     def fatal(message: String, cause: Throwable): Unit                 = {}
@@ -121,22 +121,17 @@ object logging {
   class DriverLayout extends LayoutBase[ILoggingEvent] {
     import scala.collection.JavaConverters._
 
-    private val AVERAGE_MAXIMAL_MESSAGE_LENGTH = 256
-    private val FieldSeparator                 = "="
-    private val DateFormatString               = "MM/dd/yyyy HH:mm:ss"
-    private val newline                        = System.getProperty("line.separator")
-    private val IgnoredClassesInStack          = Set("org.apache.catalina", "org.apache.coyote", "sun.reflect", "javax.servlet")
+    private val FieldSeparator        = "="
+    private val DateFormatString      = "MM/dd/yyyy HH:mm:ss"
+    private val newline               = System.getProperty("line.separator")
+    private val IgnoredClassesInStack = Set("org.apache.catalina", "org.apache.coyote", "sun.reflect", "javax.servlet")
 
     override def doLayout(loggingEvent: ILoggingEvent): String = {
 
-      val message = new StringBuilder(AVERAGE_MAXIMAL_MESSAGE_LENGTH)
-        .append(new SimpleDateFormat(DateFormatString).format(new Date(loggingEvent.getTimeStamp)))
-        .append(" [")
-        .append(StringUtils.rightPad(loggingEvent.getLevel.toString, 5))
-        .append(']')
-        .append(" - ")
-        .append(loggingEvent.getMessage)
-        .append(newline)
+      val date  = new SimpleDateFormat(DateFormatString).format(new Date(loggingEvent.getTimeStamp))
+      val level = StringUtils.rightPad(loggingEvent.getLevel.toString, 5)
+
+      val message = new StringBuilder(s"$date [$level] - loggingEvent.getMessage$newline")
 
       logContext(message, loggingEvent)
 
@@ -148,9 +143,7 @@ object logging {
 
           val _ = message
             .append(s"Location: ${location.getClassName}.${location.getMethodName}:${location.getLineNumber}$newline")
-            .append("Exception: ")
-            .append(location.toString)
-            .append(newline)
+            .append(s"Exception: ${location.toString}$newline")
 
           if (stacktraceLength > 1) {
             message.append(stacktrace.tail.filterNot { e =>
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index c615d99..bfb4ddd 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -52,10 +52,9 @@ object rest {
         ByteString(crypto.decrypt(crypto.keyForToken(authToken))(bytes.toArray))
       }
 
-      val request = requestStub
-        .withEntity(requestStub.entity.transformDataBytes(encryptionFlow))
-        .withHeaders(
-          RawHeader(AuthService.AuthenticationTokenHeader, authToken.value.value))
+      val request = (if(requestStub.entity.isKnownEmpty()) requestStub else {
+        requestStub.withEntity(requestStub.entity.transformDataBytes(encryptionFlow))
+      }).withHeaders(RawHeader(AuthService.AuthenticationTokenHeader, authToken.value.value))
 
       log.audit(s"Sending to ${request.uri} request $request")
 
-- 
cgit v1.2.3