Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion lib/grpc/server/adapters/cowboy/handler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@ defmodule GRPC.Server.Adapters.Cowboy.Handler do
error = %RPCError{status: GRPC.Status.deadline_exceeded(), message: "Deadline expired"}
req = send_error(req, error, state, :timeout)

[req: req]
|> ReportException.new(error)
|> log_error()

{:stop, req, state}
end

Expand Down Expand Up @@ -694,7 +698,7 @@ defmodule GRPC.Server.Adapters.Cowboy.Handler do
{:wait, ref}
end

defp log_error(%ReportException{kind: kind} = exception, stacktrace) do
defp log_error(%ReportException{kind: kind} = exception, stacktrace \\ []) do
crash_reason = GRPC.Logger.crash_reason(kind, exception, stacktrace)

kind
Expand Down
20 changes: 13 additions & 7 deletions test/grpc/integration/server_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,20 @@ defmodule GRPC.Integration.ServerTest do
end

test "return deadline error for slow server" do
run_server([TimeoutServer], fn port ->
{:ok, channel} = GRPC.Stub.connect("localhost:#{port}")
rect = %Routeguide.Rectangle{}
error = %GRPC.RPCError{message: "Deadline expired", status: 4}
logs =
ExUnit.CaptureLog.capture_log(fn ->
run_server([TimeoutServer], fn port ->
{:ok, channel} = GRPC.Stub.connect("localhost:#{port}")
rect = %Routeguide.Rectangle{}
error = %GRPC.RPCError{message: "Deadline expired", status: 4}

assert {:error, ^error} =
channel |> Routeguide.RouteGuide.Stub.list_features(rect, timeout: 500)
end)
assert {:error, ^error} =
channel |> Routeguide.RouteGuide.Stub.list_features(rect, timeout: 500)
end)
end)

assert logs =~
"Exception raised while handling /routeguide.RouteGuide/ListFeatures:\n** (GRPC.RPCError) Deadline expired"
end

test "return normally for a little slow server" do
Expand Down
Loading