Skip to content

Commit 4287d65

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents b00da42 + 073ef4d commit 4287d65

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

source/ada/lsp-ada_driver.adb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,12 @@ begin
618618
Server.Run
619619
(GPR_Handler'Unchecked_Access,
620620
Tracer'Unchecked_Access,
621-
In_Logger => (if In_Trace.Is_Active
621+
-- Disable the In/Out additional logger if the global
622+
-- ALS.MAIN.LOGGER trace is not active or if the specific
623+
-- ALS.IN/ALS.OUT traces are not active.
624+
In_Logger => (if Server_Logger_Trace.Is_Active and then In_Trace.Is_Active
622625
then In_Logger'Unchecked_Access else null),
623-
Out_Logger => (if Out_Trace.Is_Active
626+
Out_Logger => (if Server_Logger_Trace.Is_Active and then Out_Trace.Is_Active
624627
then Out_Logger'Unchecked_Access else null));
625628

626629
else

0 commit comments

Comments
 (0)