diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 12:55:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 12:55:45 +0300 |
| commit | 8a97772aca25cb233778ce99c487c674c86ba2fd (patch) | |
| tree | 4bbb2614385ca3cf88c166a5faaf0679cf97f7db /config | |
| parent | 5bc8aa03f1ac7ff5a20ae77e8f62631370a52d1a (diff) | |
Add latest changes from gitlab-org/security/gitlab@12-6-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/graphql.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb index f1bc289f1f0..2b21c9d9729 100644 --- a/config/initializers/graphql.rb +++ b/config/initializers/graphql.rb @@ -5,3 +5,7 @@ GraphQL::Field.accepts_definitions(authorize: GraphQL::Define.assign_metadata_ke GraphQL::Schema::Object.accepts_definition(:authorize) GraphQL::Schema::Field.accepts_definition(:authorize) + +GitlabSchema.middleware << GraphQL::Schema::TimeoutMiddleware.new(max_seconds: ENV.fetch('GITLAB_RAILS_GRAPHQL_TIMEOUT', 30).to_i) do |timeout_error, query| + Gitlab::GraphqlLogger.error(message: timeout_error.to_s, query: query.query_string, query_variables: query.provided_variables) +end |