File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed
lldb/tools/lldb-dap/src-ts Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -167,9 +167,12 @@ Restarting the server will interrupt any existing debug sessions and start a new
167
167
return [
168
168
path ,
169
169
...args ,
170
- ...Object . entries ( env ?? { } ) . map (
171
- ( entry ) => String ( entry [ 0 ] ) + "=" + String ( entry [ 1 ] ) ,
172
- ) ,
170
+ ...Object . entries ( env ?? { } )
171
+ // Filter and sort to avoid restarting the server just because the
172
+ // order of env changed or the log path changed.
173
+ . filter ( ( entry ) => String ( entry [ 0 ] ) !== "LLDBDAP_LOG" )
174
+ . sort ( )
175
+ . map ( ( entry ) => String ( entry [ 0 ] ) + "=" + String ( entry [ 1 ] ) ) ,
173
176
] ;
174
177
}
175
178
}
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ export class LogFilePathProvider {
44
44
const logFolder = this . logFolder || this . context . logUri . fsPath ;
45
45
switch ( type ) {
46
46
case LogType . DEBUG_SESSION :
47
- return path . join ( logFolder , `lldb-dap-session- ${ formatDate ( new Date ( ) ) } .log` ) ;
47
+ return path . join ( logFolder , `lldb-dap-${ formatDate ( new Date ( ) ) } - ${ vscode . env . sessionId . split ( "-" ) [ 0 ] } .log` ) ;
48
48
break ;
49
49
}
50
50
}
You can’t perform that action at this time.
0 commit comments