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

Remove deprecated request-logging.enabled option. #347

Merged
merged 1 commit into from
Nov 19, 2018
Merged

Remove deprecated request-logging.enabled option. #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion components/proxy/src/main/java/com/hotels/styx/startup/StyxPipelineFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ private static HttpHandler styxHttpPipeline(StyxConfig config, HttpHandler inter
ImmutableList.Builder<HttpInterceptor> builder = ImmutableList.builder();

boolean loggingEnabled = config.get("request-logging.inbound.enabled", Boolean.class)
.map(isEnabled -> isEnabled || config.get("request-logging.enabled", Boolean.class).orElse(false))
.orElse(false);

boolean longFormatEnabled = config.get("request-logging.inbound.longFormat", Boolean.class)
Expand Down
11 changes: 6 additions & 5 deletions docs/user-guide/configure-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ using environment variables with the same name as the property.
enabled: true

request-logging:
# Enabled logging of requests and responses (with requestId to match them up)
# Logs are produced on server and client side, so there is an information on
# how the server-side (inbound) and client-side (outbound) request/response look like.
# Enable logging of requests and responses (with requestId to match them up).
# Logs are produced on server and origin side, so there is an information on
# how the server-side (inbound) and origin-side (outbound) request/response look like.
# In long format log entry contains additionally headers and cookies.
inbound:
enabled: true
Expand Down Expand Up @@ -187,8 +187,9 @@ Without the comments, it looks like this:
enabled: true

request-logging:
enabled: true

inbound:
enabled: true

styxHeaders:
styxInfo:
name: "X-Styx-Info"
Expand Down
3 changes: 0 additions & 3 deletions system-tests/e2e-suite/src/test/scala/com/hotels/styx/client/CipherSuitesSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.hotels.styx.client

import java.nio.charset.StandardCharsets
import java.nio.charset.StandardCharsets.UTF_8

import com.github.tomakehurst.wiremock.client.WireMock._
Expand Down Expand Up @@ -47,8 +46,6 @@ class CipherSuitesSpec extends FunSpec
| connectors:
| http:
| port: 0
|request-logging:
| enabled: true
""".stripMargin,
logbackXmlLocation = logback)

Expand Down
2 changes: 0 additions & 2 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 @@ -72,8 +72,6 @@ class HealthCheckSpec extends FunSpec
| connectors:
| http:
| port: 0
|request-logging:
| enabled: true
""".stripMargin,
logbackXmlLocation = logback)

Expand Down
2 changes: 0 additions & 2 deletions system-tests/e2e-suite/src/test/scala/com/hotels/styx/client/TlsVersionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ class TlsVersionSpec extends FunSpec
| connectors:
| http:
| port: 0
|request-logging:
| enabled: true
""".stripMargin,
logbackXmlLocation = logback)

Expand Down