Skip to content

Commit b0a02af

Browse files
committed
Better tracing middleware initialization
1 parent 27faf0f commit b0a02af

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

graphql/execution/executor.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ def execute(schema, document_ast, root_value=None, context_value=None,
3939
'not multiple versions of GraphQL installed in your node_modules directory.'
4040
)
4141

42-
tracing_middleware = None
43-
if tracing:
44-
tracing_middleware = TracingMiddleware()
45-
tracing_middleware.start()
46-
47-
if not isinstance(middleware, MiddlewareManager):
48-
middleware = MiddlewareManager(tracing_middleware)
49-
else:
50-
middleware.middlewares.insert(0, tracing_middleware)
51-
5242
if middleware:
5343
if not isinstance(middleware, MiddlewareManager):
5444
middleware = MiddlewareManager(*middleware)
@@ -58,6 +48,17 @@ def execute(schema, document_ast, root_value=None, context_value=None,
5848
' of MiddlewareManager. Received "{}".'.format(middleware)
5949
)
6050

51+
tracing_middleware = None
52+
if tracing:
53+
tracing_middleware = TracingMiddleware()
54+
tracing_middleware.start()
55+
56+
if middleware:
57+
middleware.middlewares.insert(0, tracing_middleware)
58+
else:
59+
middleware = MiddlewareManager(tracing_middleware)
60+
61+
6162
if executor is None:
6263
executor = SyncExecutor()
6364

0 commit comments

Comments
 (0)