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

Don't reconnect on request failures. #97

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Don't reconnect on request failures. #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6af67a9
Don't reconnect on request failures.
abizjak Oct 18, 2023
5ed4808
Changelog and version.
abizjak Oct 19, 2023
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
2 changes: 1 addition & 1 deletion deps/concordium-client
Open in desktop
Submodule concordium-client updated 9 files
+4 −1 ChangeLog.md
+1 −4 app/Main.hs
+1 −1 concordium-client.cabal
+1 −1 package.yaml
+2 −0 scripts/distributables/linux-build-distributable-concordium-client.sh
+16 −24 src/Concordium/Client/Commands.hs
+12 −9 src/Concordium/Client/GRPC2.hs
+9 −3 src/Concordium/Client/Runner/Helper.hs
+1 −1 stack.linux-static.yaml
16 changes: 14 additions & 2 deletions src/Proxy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import qualified Database.Esqueleto.Legacy as E
import qualified Database.Esqueleto.PostgreSQL.JSON as EJ
import Lens.Micro.Platform hiding ((.=))
import Network.GRPC.HTTP2.Types (GRPCStatusCode (..))
import Network.HTTP.Types (Status, badGateway502, badRequest400, internalServerError500, notFound404)
import Network.HTTP.Types (Status, badGateway502, badRequest400, internalServerError500, notFound404, serviceUnavailable503)
import System.Random
import Text.Read hiding (String)
import Web.Cookie
Expand Down Expand Up @@ -174,7 +174,7 @@ share
total_supply (Ratio Integer)
|]

data ErrorCode = InternalError | RequestInvalid | DataNotFound
data ErrorCode = InternalError | RequestInvalid | DataNotFound | Unavailable
deriving (Eq, Show, Enum)

-- | Configuration for the @appSettings@ endpoint that returns whether the app is
Expand Down Expand Up @@ -446,6 +446,18 @@ runGRPCWithCustomError resp c k = do
StatusNotOk (NOT_FOUND, err) -> do
return $
Left (StatusNotOkError NOT_FOUND, notFound404, DataNotFound, EMGRPCErrorResponse $ "Requested object was not found: " <> err)
-- GRPC response with status code 'CANCELLED', i.e., the server timed out the request.
StatusNotOk (CANCELLED, err) -> do
return $
Left (StatusNotOkError CANCELLED, serviceUnavailable503, Unavailable, EMGRPCErrorResponse $ "The node is overloaded so the request was cancelled: " <> err)
-- GRPC response with status code 'RESOURCE_EXHAUSTED'.
StatusNotOk (RESOURCE_EXHAUSTED, err) -> do
return $
Left (StatusNotOkError RESOURCE_EXHAUSTED, serviceUnavailable503, Unavailable, EMGRPCErrorResponse $ "The node is overloaded so the request was cancelled: " <> err)
-- GRPC response with status code 'DEADLINE_EXCEEDED'
StatusNotOk (DEADLINE_EXCEEDED, err) -> do
return $
Left (StatusNotOkError DEADLINE_EXCEEDED, serviceUnavailable503, Unavailable, EMGRPCErrorResponse $ "The node is overloaded so the request was cancelled: " <> err)
-- GRPC response with valid non-'OK' status code.
StatusNotOk (status, err) -> do
$(logError) $ "Got non-OK GRPC status code '" <> Text.pack (show status) <> "': " <> Text.pack err
Expand Down
Loading