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

Jump to bottom

Log PeerClosedStreamExceptions as warnings instead of errors #360

Merged
merged 1 commit into from
Sep 14, 2024
Merged

Log PeerClosedStreamExceptions as warnings instead of errors #360

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
10 changes: 8 additions & 2 deletions runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import pekko.http.javadsl.model.HttpResponse
import pekko.japi.{ Function => jFunction }
import io.grpc.{ Status, StatusRuntimeException }

import org.apache.pekko.http.scaladsl.model.http2.PeerClosedStreamException

import scala.concurrent.ExecutionException
import pekko.event.Logging

Expand All @@ -40,6 +42,8 @@ object GrpcExceptionHandler {
default(system)
}

private def log(system: ActorSystem) = Logging(system, "org.apache.pekko.grpc.javadsl.GrpcExceptionHandler")

/** INTERNAL API */
@InternalApi
private def default(system: ActorSystem): jFunction[Throwable, Trailers] =
Expand All @@ -57,9 +61,11 @@ object GrpcExceptionHandler {
case e: NotImplementedError => Trailers(Status.UNIMPLEMENTED.withDescription(e.getMessage))
case e: UnsupportedOperationException => Trailers(Status.UNIMPLEMENTED.withDescription(e.getMessage))
case e: StatusRuntimeException => Trailers(e.getStatus, new GrpcMetadataImpl(e.getTrailers))
case e: PeerClosedStreamException =>
log(system).warning(e, "Peer closed the stream: [{}]", e.getMessage)
INTERNAL
case other =>
val log = Logging(system, "org.apache.pekko.grpc.javadsl.GrpcExceptionHandler")
log.error(other, "Unhandled error: [{}]", other.getMessage)
log(system).error(other, "Unhandled error: [{}]", other.getMessage)
INTERNAL
}
}
Expand Down
9 changes: 7 additions & 2 deletions runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import pekko.grpc.GrpcProtocol.GrpcProtocolWriter
import pekko.grpc.internal.{ GrpcMetadataImpl, GrpcResponseHelpers, MissingParameterException }
import pekko.http.scaladsl.model.HttpResponse
import io.grpc.{ Status, StatusRuntimeException }
import org.apache.pekko.http.scaladsl.model.http2.PeerClosedStreamException

import scala.concurrent.{ ExecutionException, Future }
import pekko.event.Logging
Expand All @@ -31,6 +32,8 @@ object GrpcExceptionHandler {
private val INTERNAL = Trailers(Status.INTERNAL)
private val INVALID_ARGUMENT = Trailers(Status.INVALID_ARGUMENT)

private def log(system: ActorSystem) = Logging(system, "org.apache.pekko.grpc.scaladsl.GrpcExceptionHandler")

def defaultMapper(system: ActorSystem): PartialFunction[Throwable, Trailers] = {
case e: ExecutionException =>
if (e.getCause == null) INTERNAL
Expand All @@ -42,9 +45,11 @@ object GrpcExceptionHandler {
case e: StatusRuntimeException =>
val meta = Option(e.getTrailers).getOrElse(new io.grpc.Metadata())
Trailers(e.getStatus, new GrpcMetadataImpl(meta))
case e: PeerClosedStreamException =>
log(system).warning(e, "Peer closed the stream: [{}]", e.getMessage)
INTERNAL
case other =>
val log = Logging(system, "org.apache.pekko.grpc.scaladsl.GrpcExceptionHandler")
log.error(other, "Unhandled error: [{}]", other.getMessage)
log(system).error(other, "Unhandled error: [{}]", other.getMessage)
INTERNAL
}

Expand Down
Loading