Merge branch 'stable-3.1'
* stable-3.1:
e2e-tests: Add support for log level configuration
Change-Id: I6eb44b1860cad7c272c5500b1a582acd0c91b602
diff --git a/Documentation/dev-e2e-tests.txt b/Documentation/dev-e2e-tests.txt
index 92c069d..9dd4d0f 100644
--- a/Documentation/dev-e2e-tests.txt
+++ b/Documentation/dev-e2e-tests.txt
@@ -44,6 +44,14 @@
[warn] Credentials file ~/.sbt/sonatype_credentials does not exist
----
+Every `sbt` command can include an optional log level
+link:https://www.scala-sbt.org/1.x/docs/Howto-Logging.html#Change+the+logging+level+globally[argument,role=external,window=_blank].
+Below, `[info]` logs are no longer shown:
+
+----
+sbt --warn compile
+----
+
=== How to build using Docker
----
@@ -107,6 +115,10 @@
sbt "gatling:lastReport"
----
+The `src/test/resources/logback.xml` file
+link:http://logback.qos.ch/manual/configuration.html[configures,role=external,window=_blank]
+Gatling's logging level.
+
=== How to run using Docker
----
diff --git a/e2e-tests/load-tests/src/test/resources/logback.xml b/e2e-tests/load-tests/src/test/resources/logback.xml
new file mode 100644
index 0000000..a139e69
--- /dev/null
+++ b/e2e-tests/load-tests/src/test/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <root level="warn">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
