Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve test logging. #562

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Improve test logging. #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e568e0
Add appenders to the test logging configurations.
mikkokar Dec 11, 2019
6834872
Tidy up.
mikkokar Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions components/api/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
7 changes: 7 additions & 0 deletions components/client/src/test/integration/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
7 changes: 7 additions & 0 deletions components/client/src/test/unit/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
7 changes: 7 additions & 0 deletions components/common/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
7 changes: 7 additions & 0 deletions components/proxy/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
7 changes: 7 additions & 0 deletions components/server/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
Expand Down
24 changes: 16 additions & 8 deletions system-tests/e2e-suite/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<logger name="Styx-Tests" level="INFO"/>
<logger name="com.hotels.styx.http-messages.inbound" level="INFO"/>
<logger name="com.hotels.styx.http-messages.outbound" level="INFO"/>
<logger name="com.hotels.styx.proxy.backends.file.FileChangeMonitor" level="INFO"/>
<logger name="com.hotels.styx.proxy.encoders.ConfigurableUnwiseCharsEncoder" level="INFO"/>
<logger name="com.hotels.styx.server.netty.connectors.HttpPipelineHandler" level="INFO"/>

<root level="ERROR">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
<logger name="com.hotels.styx.http-messages.inbound" level="INFO"/>
<logger name="com.hotels.styx.http-messages.outbound" level="INFO"/>
<logger name="com.hotels.styx.proxy.backends.file.FileChangeMonitor" level="INFO"/>
<logger name="com.hotels.styx.proxy.encoders.ConfigurableUnwiseCharsEncoder" level="INFO"/>
<logger name="com.hotels.styx.server.netty.connectors.HttpPipelineHandler" level="INFO"/>
<logger name="com.hotels.styx.proxy.HttpErrorStatusCauseLogger" level="INFO"/>

</configuration>
17 changes: 1 addition & 16 deletions system-tests/e2e-suite/src/test/scala/com/hotels/styx/client/HealthCheckSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
import com.github.tomakehurst.wiremock.client.WireMock._
import com.github.tomakehurst.wiremock.client.{ValueMatchingStrategy, WireMock}
import com.hotels.styx.api.HttpRequest.get
import com.hotels.styx.api.HttpHeaderNames.HOST
import com.hotels.styx.api.HttpRequest
import com.hotels.styx.api.HttpResponseStatus._
import com.hotels.styx.support.ResourcePaths.fixturesHome
import com.hotels.styx.support.backends.FakeHttpServer
import com.hotels.styx.support.configuration._
import com.hotels.styx.utils.StubOriginHeader.STUB_ORIGIN_INFO
Expand All @@ -41,8 +39,6 @@ class HealthCheckSpec extends FunSpec
with StyxClientSupplier
with SequentialNestedSuiteExecution {

val logback = fixturesHome(this.getClass, "/conf/logback/logback-debug-stdout.xml")

val httpApp = FakeHttpServer.HttpStartupConfig(
appId = "httpApp",
originId = "httpApp-01"
Expand Down Expand Up @@ -74,8 +70,7 @@ class HealthCheckSpec extends FunSpec
| port: 0
|services:
| factories: {}
""".stripMargin,
logbackXmlLocation = logback)
""".stripMargin)

override protected def beforeAll(): Unit = {
super.beforeAll()
Expand Down Expand Up @@ -114,23 +109,13 @@ class HealthCheckSpec extends FunSpec
}
}

private def httpRequest(path: String) = get(styxServer.routerURL(path)).build()

private def valueMatchingStrategy(matches: String) = {
val matchingStrategy = new ValueMatchingStrategy()
matchingStrategy.setMatches(matches)
matchingStrategy
}

private def originResponse(appId: String) = aResponse
.withStatus(OK.code())
.withHeader(STUB_ORIGIN_INFO.toString, appId)
.withBody("Hello, World!")

private def activeOrigins(response: String, appId: String) = originStatuses(response, appId, "activeOrigins")

private def inactiveOrigins(response: String, appId: String) = originStatuses(response, appId, "inactiveOrigins")

private def originStatuses(response: String, appId: String, state: String): Seq[String] = {
val tree0 = mapper.readTree(response).get(appId)
val tree = tree0.get(state)
Expand Down
13 changes: 10 additions & 3 deletions system-tests/ft-suite/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="OFF">
<appender-ref ref="STDOUT"/>
</root>

<logger name="Styx-Tests" level="INFO"/>
<logger name="com.hotels.styx.http-messages.inbound" level="INFO"/>
<logger name="com.hotels.styx.http-messages.outbound" level="INFO"/>

<root level="ERROR">
</root>

</configuration>