diff options
author | Stewart Stewart <stewart@driver.xyz> | 2017-09-25 18:51:53 -0700 |
---|---|---|
committer | Stewart Stewart <stewart@driver.xyz> | 2017-09-25 18:52:20 -0700 |
commit | 8d975a4d3681d0ba41bd8272f572a78de62e7f89 (patch) | |
tree | 760ed57257308d9eeb78106911f86fcc76c59308 /src | |
parent | 508d59ea5e2865a5bfc6d380527b1ab91e0fddd5 (diff) | |
download | driver-core-8d975a4d3681d0ba41bd8272f572a78de62e7f89.tar.gz driver-core-8d975a4d3681d0ba41bd8272f572a78de62e7f89.tar.bz2 driver-core-8d975a4d3681d0ba41bd8272f572a78de62e7f89.zip |
Add MdcExecutionContext to logging pacagkev1.1.1
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/MdcAsyncExecutor.scala | 9 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/logging.scala | 63 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/logging/DriverLayout.scala | 58 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala (renamed from src/main/scala/xyz/driver/core/database/MdcExecutionContext.scala) | 6 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/logging/package.scala | 7 |
5 files changed, 78 insertions, 65 deletions
diff --git a/src/main/scala/xyz/driver/core/database/MdcAsyncExecutor.scala b/src/main/scala/xyz/driver/core/database/MdcAsyncExecutor.scala index ac8456e..5939efb 100644 --- a/src/main/scala/xyz/driver/core/database/MdcAsyncExecutor.scala +++ b/src/main/scala/xyz/driver/core/database/MdcAsyncExecutor.scala @@ -1,4 +1,9 @@ -package xyz.driver.core.database +/** Code ported from "de.geekonaut" %% "slickmdc" % "1.0.0" + * License: @see https://github.com/AVGP/slickmdc/blob/master/LICENSE + * Blog post: @see http://50linesofco.de/post/2016-07-01-slick-and-slf4j-mdc-logging-in-scala.html + */ +package xyz.driver.core +package database import java.util.concurrent._ import java.util.concurrent.atomic.AtomicInteger @@ -7,6 +12,8 @@ import scala.concurrent._ import com.typesafe.scalalogging.StrictLogging import slick.util.AsyncExecutor +import logging.MdcExecutionContext + /** Taken from the original Slick AsyncExecutor and simplified * @see https://github.com/slick/slick/blob/3.1/slick/src/main/scala/slick/util/AsyncExecutor.scala */ diff --git a/src/main/scala/xyz/driver/core/logging.scala b/src/main/scala/xyz/driver/core/logging.scala deleted file mode 100644 index 9a5805d..0000000 --- a/src/main/scala/xyz/driver/core/logging.scala +++ /dev/null @@ -1,63 +0,0 @@ -package xyz.driver.core - -import java.text.SimpleDateFormat -import java.util.Date - -import ch.qos.logback.classic.spi.ILoggingEvent -import ch.qos.logback.core.LayoutBase -import org.apache.commons.lang3.StringUtils -import org.slf4j.helpers.NOPLogger - -object logging { - - val NoLogger = com.typesafe.scalalogging.Logger(NOPLogger.NOP_LOGGER) - - class DriverLayout extends LayoutBase[ILoggingEvent] { - import scala.collection.JavaConverters._ - - 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 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) - - Option(loggingEvent.getCallerData) foreach { stacktrace => - val stacktraceLength = stacktrace.length - - if (stacktraceLength > 0) { - val location = stacktrace.head - - val _ = message - .append(s"Location: ${location.getClassName}.${location.getMethodName}:${location.getLineNumber}$newline") - .append(s"Exception: ${location.toString}$newline") - - if (stacktraceLength > 1) { - message.append(stacktrace.tail.filterNot { e => - IgnoredClassesInStack.forall(ignored => !e.getClassName.startsWith(ignored)) - } map { - _.toString - } mkString newline) - } - } - } - - message.toString - } - - private def logContext(message: StringBuilder, loggingEvent: ILoggingEvent) = { - Option(loggingEvent.getMDCPropertyMap).map(_.asScala).filter(_.nonEmpty).foreach { context => - message.append( - context map { case (key, value) => s"$key$FieldSeparator$value" } mkString ("Context: ", " ", newline) - ) - } - } - } -} diff --git a/src/main/scala/xyz/driver/core/logging/DriverLayout.scala b/src/main/scala/xyz/driver/core/logging/DriverLayout.scala new file mode 100644 index 0000000..5e6c7df --- /dev/null +++ b/src/main/scala/xyz/driver/core/logging/DriverLayout.scala @@ -0,0 +1,58 @@ +package xyz.driver.core +package logging + +import java.text.SimpleDateFormat +import java.util.Date + +import ch.qos.logback.classic.spi.ILoggingEvent +import ch.qos.logback.core.LayoutBase +import org.apache.commons.lang3.StringUtils + +class DriverLayout extends LayoutBase[ILoggingEvent] { + import scala.collection.JavaConverters._ + + 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 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) + + Option(loggingEvent.getCallerData) foreach { stacktrace => + val stacktraceLength = stacktrace.length + + if (stacktraceLength > 0) { + val location = stacktrace.head + + val _ = message + .append(s"Location: ${location.getClassName}.${location.getMethodName}:${location.getLineNumber}$newline") + .append(s"Exception: ${location.toString}$newline") + + if (stacktraceLength > 1) { + message.append(stacktrace.tail.filterNot { e => + IgnoredClassesInStack.forall(ignored => !e.getClassName.startsWith(ignored)) + } map { + _.toString + } mkString newline) + } + } + } + + message.toString + } + + private def logContext(message: StringBuilder, loggingEvent: ILoggingEvent) = { + Option(loggingEvent.getMDCPropertyMap).map(_.asScala).filter(_.nonEmpty).foreach { context => + message.append( + context map { case (key, value) => s"$key$FieldSeparator$value" } mkString ("Context: ", " ", newline) + ) + } + } +} diff --git a/src/main/scala/xyz/driver/core/database/MdcExecutionContext.scala b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala index f08f16c..9f8db3e 100644 --- a/src/main/scala/xyz/driver/core/database/MdcExecutionContext.scala +++ b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala @@ -1,4 +1,8 @@ -package xyz.driver.core.database +/** Code ported from "de.geekonaut" %% "slickmdc" % "1.0.0" + * License: @see https://github.com/AVGP/slickmdc/blob/master/LICENSE + * Blog post: @see http://50linesofco.de/post/2016-07-01-slick-and-slf4j-mdc-logging-in-scala.html + */ +package xyz.driver.core.logging import org.slf4j.MDC import scala.concurrent.ExecutionContext diff --git a/src/main/scala/xyz/driver/core/logging/package.scala b/src/main/scala/xyz/driver/core/logging/package.scala new file mode 100644 index 0000000..2b6fc11 --- /dev/null +++ b/src/main/scala/xyz/driver/core/logging/package.scala @@ -0,0 +1,7 @@ +package xyz.driver.core + +import org.slf4j.helpers.NOPLogger + +package object logging { + val NoLogger = com.typesafe.scalalogging.Logger(NOPLogger.NOP_LOGGER) +} |