Skip to content

Commit

Permalink
server: Fix issues with remote schemas over TLS
Browse files Browse the repository at this point in the history
  • Loading branch information
paf31 authored Feb 23, 2021
1 parent c4ebae2 commit 2734b5b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ keys in the response body.
- server: add "resource_version" field to metadata for concurrency control - disable lookup during migrations
- server: fix issue with queries on character column types (close #6217)
- server: optimize resolving source. Resolving a source would create connection pools every time. Optimize that to re-create connection pools only when necessary. (#609)
- server: fix issues with remote schema introspection and queries over TLS.

## v1.4.0-alpha.1

Expand Down
3 changes: 2 additions & 1 deletion pro/server/src/HasuraPro/App.hs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import qualified HasuraPro.Redis.LeakyBucket as LeakyBucket
import qualified Language.GraphQL.Draft.Parser as GQL
import qualified Language.GraphQL.Draft.Syntax as GQL
import qualified Network.HTTP.Client as HTTP
import qualified Network.HTTP.Client.TLS as HTTP (tlsManagerSettings)
import qualified Network.HTTP.Types as HTTP
import qualified Network.Wai as Wai
import qualified System.Log.FastLogger as FL
Expand Down Expand Up @@ -888,7 +889,7 @@ initialiseProServeCtx tenantId workerId env pci@ProConnInfo{..}
pure (_gcHttpManager, pool, rebuildableSchemaCache, cacheInitStartTime, schemaSyncListenerThread, schemaSyncEventRef, dbId)

MetadataStorageModeExternal pool (schemaSyncListenerThread, schemaSyncEventRef) -> do
httpManager <- liftIO $ HTTP.newManager HTTP.defaultManagerSettings
httpManager <- liftIO $ HTTP.newManager HTTP.tlsManagerSettings
defaultSrcCfg <- mkDefaultSourceConfig
(rebuildableSchemaCache, cacheInitStartTime) <-
initSchemaCache httpManager serverConfigCtx logger proLogger pgLogger pool defaultSrcCfg
Expand Down

0 comments on commit 2734b5b

Please sign in to comment.