From 9d54184f308893338967b18874dedebf38acf89e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 2 Jan 2020 21:07:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/graphql.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/initializers/graphql.rb') 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 -- cgit v1.2.1