Skip to content

Commit cad2e75

Browse files
committed
Undo changes to multiplex initialization
1 parent 38cc6f7 commit cad2e75

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

lib/graphql/execution/interpreter.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,23 @@ class << self
2222
# @param max_complexity [Integer, nil]
2323
# @return [Array<GraphQL::Query::Result>] One result per query
2424
def run_all(schema, query_options, context: {}, max_complexity: schema.max_complexity)
25-
multiplex = Execution::Multiplex.new(schema: schema, queries: [], context: context, max_complexity: max_complexity)
26-
trace = multiplex.current_trace
27-
Fiber[:__graphql_current_multiplex] = multiplex
2825
queries = query_options.map do |opts|
2926
query = case opts
3027
when Hash
31-
schema.query_class.new(schema, nil, multiplex: multiplex, **opts)
28+
schema.query_class.new(schema, nil, **opts)
3229
when GraphQL::Query
33-
opts.multiplex = multiplex
3430
opts
3531
else
3632
raise "Expected Hash or GraphQL::Query, not #{opts.class} (#{opts.inspect})"
3733
end
38-
multiplex.queries.push(query)
3934
query
4035
end
4136

4237
return GraphQL::EmptyObjects::EMPTY_ARRAY if queries.empty?
4338

39+
multiplex = Execution::Multiplex.new(schema: schema, queries: queries, context: context, max_complexity: max_complexity)
40+
trace = multiplex.current_trace
41+
Fiber[:__graphql_current_multiplex] = multiplex
4442
trace.begin_execute_multiplex(multiplex)
4543
trace.execute_multiplex(multiplex: multiplex) do
4644
schema = multiplex.schema

lib/graphql/tracing/perfetto_trace.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@ def track_descriptor_packet(parent_uuid, uuid, name, counter: nil)
687687

688688
def unsubscribe_from_active_support_notifications
689689
if defined?(@as_subscriber)
690-
puts "Unsubscribe ASN"
691690
ActiveSupport::Notifications.unsubscribe(@as_subscriber)
692691
end
693692
end

0 commit comments

Comments
 (0)