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

Connection pooling to fix sql resource errors #5807

Merged
merged 3 commits into from
Aug 31, 2020
Merged

Connection pooling to fix sql resource errors #5807

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c430328
Uses connection pooling for db queries
bkase Aug 28, 2020
1030bcb
Removes shadowing of existing errors
bkase Aug 30, 2020
bbbc6cc
Merge branch 'develop' into rosetta/db-connection-pooling
bkase Aug 31, 2020
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
28 changes: 21 additions & 7 deletions src/app/rosetta/lib/rosetta.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,30 @@ let router ~graphql_uri ~db ~logger route body =
| _ ->
Deferred.return (Error `Page_not_found)

let server_handler ~db ~graphql_uri ~logger ~body _sock req =
let server_handler ~pool ~graphql_uri ~logger ~body _sock req =
let uri = Cohttp_async.Request.uri req in
let%bind body = Cohttp_async.Body.to_string body in
let route = List.tl_exn (String.split ~on:'/' (Uri.path uri)) in
let%bind result =
let with_db f =
Caqti_async.Pool.use (fun db -> f ~db) pool
|> Deferred.Result.map_error ~f:(function
| `App e ->
`App e
| `Page_not_found ->
`Page_not_found
| `Connect_failed _e ->
`App (Errors.create (`Sql "Connect failed"))
| `Connect_rejected _e ->
`App (Errors.create (`Sql "Connect rejected"))
| `Post_connect _e ->
`App (Errors.create (`Sql "Post connect error")) )
in
match Yojson.Safe.from_string body with
| body ->
router route body ~db ~graphql_uri ~logger
with_db (router route body ~graphql_uri ~logger)
| exception Yojson.Json_error "Blank input data" ->
router route `Null ~db ~graphql_uri ~logger
with_db (router route `Null ~graphql_uri ~logger)
| exception Yojson.Json_error err ->
Errors.create ~context:"JSON in request malformed"
(`Json_parse (Some err))
Expand Down Expand Up @@ -70,13 +84,13 @@ let command =
fun () ->
let logger = Logger.create () in
Cli.logger_setup log_json log_level ;
match%bind Caqti_async.connect archive_uri with
match Caqti_async.connect_pool ~max_size:128 archive_uri with
| Error e ->
[%log error]
~metadata:[("error", `String (Caqti_error.show e))]
"Failed to connect to postgresql database. Error: $error" ;
"Failed to create a caqti pool to postgres. Error: $error" ;
Deferred.unit
| Ok db ->
| Ok pool ->
let%bind server =
Cohttp_async.Server.create_expert ~max_connections:128
~on_handler_error:
Expand All @@ -88,7 +102,7 @@ let command =
[ ("error", `String (Exn.to_string_mach exn))
; ("context", `String "rest_server") ] ))
(Async.Tcp.Where_to_listen.bind_to All_addresses (On_port port))
(server_handler ~db ~graphql_uri ~logger)
(server_handler ~pool ~graphql_uri ~logger)
in
[%log info]
~metadata:[("port", `Int port)]
Expand Down