Skip to content

Commit 67760c5

Browse files
fixes
1 parent dde904c commit 67760c5

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

examples/src/main/scala/sttp/tapir/examples/streaming/longLastingClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//> using dep com.softwaremill.sttp.tapir::tapir-core:1.11.11
22
//> using dep org.apache.pekko::pekko-stream:1.1.2
33
//> using dep org.typelevel::cats-effect:3.5.7
4-
//> using dep com.softwaremill.sttp.client3::core:3.10.1
4+
//> using dep com.softwaremill.sttp.client3::core:3.10.2
55
//> using dep com.softwaremill.sttp.client3::pekko-http-backend:3.10.1
66

77
package sttp.tapir.examples.streaming

examples/src/main/scala/sttp/tapir/examples/streaming/playServer.scala

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//> using dep com.softwaremill.sttp.tapir::tapir-core:1.11.11
22
//> using dep com.softwaremill.sttp.tapir::tapir-play-server:1.11.11
33
//> using dep org.playframework::play-netty-server:3.0.6
4-
//> using dep com.softwaremill.sttp.client3::core:3.10.1
4+
//> using dep com.softwaremill.sttp.client3::core:3.10.2
5+
//> using dep org.slf4j:slf4j-simple:2.0.16
56

67
package sttp.tapir.examples.streaming
78

@@ -18,11 +19,13 @@ import scala.concurrent.ExecutionContext.Implicits.global
1819
import scala.concurrent.Future
1920
import sttp.model.{HeaderNames, MediaType, Part, StatusCode}
2021
import sttp.tapir.*
22+
2123
import scala.concurrent.{ExecutionContext, Future}
2224
import scala.util.*
2325
import org.apache.pekko
2426
import pekko.stream.scaladsl.{Flow, Source}
2527
import pekko.util.ByteString
28+
import sttp.tapir.server.play.PlayServerOptions
2629

2730
given ExecutionContext = ExecutionContext.global
2831

@@ -51,15 +54,18 @@ val e = endpoint.post
5154
.out(header[Long](HeaderNames.ContentLength))
5255
.out(streamTextBody(PekkoStreams)(CodecFormat.TextPlain()))
5356
.errorOut(plainBody[ErrorInfo])
54-
.serverLogic((logic _).andThen(handleErrors))
57+
.serverLogic(logic.andThen(handleErrors))
58+
5559

56-
val routes = PlayServerInterpreter().toRoutes(e)
60+
val routes = PlayServerInterpreter(PlayServerOptions.customiseInterceptors().serverLog(PlayServerOptions.defaultServerLog.logWhenReceived(true)
61+
.logAllDecodeFailures(true)).options).toRoutes(e)
5762

5863
@main def playServer(): Unit =
5964
import play.api.Configuration
6065
import play.api.Mode
6166
import play.core.server.ServerConfig
6267

68+
6369
import java.io.File
6470
import java.util.Properties
6571

@@ -82,13 +88,13 @@ val routes = PlayServerInterpreter().toRoutes(e)
8288
"play.server.websocket.periodic-keep-alive-max-idle" -> "infinite",
8389
"play.server.max-content-length" -> "infinite",
8490
"play.server.netty.log.wire" -> true,
85-
"play.server.netty.option.child.tcpNoDelay" -> true,
91+
"play.server.netty.option.child.SO_KEEPALIVE" -> false,
8692
"play.server.pekko.requestTimeout" -> "5 seconds",
8793
)
8894
val serverConfig = ServerConfig(
8995
rootDir = new File("."),
9096
port = Some(9000),
91-
sslPort = Some(9443),
97+
sslPort = None,
9298
address = "0.0.0.0",
9399
mode = Mode.Dev,
94100
properties = System.getProperties,

perf-tests/src/main/scala/sttp/tapir/perf/play/Play.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ object Tapir extends Endpoints {
7878
(actorSystem: ActorSystem) => {
7979
implicit val actorSystemForMaterializer: ActorSystem = actorSystem
8080
implicit val ec: ExecutionContext = actorSystem.dispatcher
81-
val serverOptions = buildOptions(PlayServerOptions.customiseInterceptors(), withServerLog)
81+
val serverOptions = buildOptions(PlayServerInterpreter, withServerLog)
8282
PlayServerInterpreter(serverOptions).toRoutes(
8383
genEndpointsFuture(nRoutes)
8484
)

server/play29-server/src/test/scala/sttp/tapir/server/play/PlayServerTest.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ class PlayServerTest extends TestSuite {
103103
def drainAkka(stream: AkkaStreams.BinaryStream): Future[Unit] =
104104
stream.runWith(Sink.ignore).map(_ => ())
105105

106+
PlayServerOptions.customiseInterceptors().serverLog(PlayServerOptions.defaultServerLog.logWhenReceived(true)
107+
.logAllDecodeFailures(true)).options
108+
106109
new ServerBasicTests(
107110
createServerTest,
108111
interpreter,

0 commit comments

Comments
 (0)