Skip to content

Commit bec4bf7

Browse files
authored
Fix bug in DefaultObserverFactory (#6259)
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
1 parent 824dabb commit bec4bf7

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

modules/nextflow/src/main/groovy/nextflow/trace/DefaultObserverFactory.groovy

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package nextflow.trace
1818

1919
import java.nio.file.Path
2020

21+
import groovy.transform.CompileStatic
2122
import nextflow.Session
2223
import nextflow.file.FileHelper
2324

@@ -26,6 +27,7 @@ import nextflow.file.FileHelper
2627
*
2728
* @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
2829
*/
30+
@CompileStatic
2931
class DefaultObserverFactory implements TraceObserverFactoryV2 {
3032

3133
private Map config
@@ -35,18 +37,19 @@ class DefaultObserverFactory implements TraceObserverFactoryV2 {
3537
this.config = session.config
3638

3739
final result = new ArrayList<TraceObserverV2>(5)
38-
if( session.ansiLog )
39-
createAnsiLogObserver(result)
40+
createAnsiLogObserver(result, session)
4041
createGraphObserver(result)
4142
createReportObserver(result)
4243
createTimelineObserver(result)
4344
createTraceFileObserver(result)
4445
return result
4546
}
4647

47-
protected void createAnsiLogObserver(Collection<TraceObserverV2> result) {
48-
session.ansiLogObserver = new AnsiLogObserver()
49-
result << session.ansiLogObserver
48+
protected void createAnsiLogObserver(Collection<TraceObserverV2> result, Session session) {
49+
if( session.ansiLog ) {
50+
session.ansiLogObserver = new AnsiLogObserver()
51+
result << session.ansiLogObserver
52+
}
5053
}
5154

5255
protected void createReportObserver(Collection<TraceObserverV2> result) {

modules/nextflow/src/main/groovy/nextflow/trace/GraphObserver.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package nextflow.trace
1818

1919
import java.nio.file.Path
2020

21+
import groovy.transform.CompileStatic
2122
import groovy.transform.PackageScope
2223
import groovy.util.logging.Slf4j
2324
import nextflow.Session
@@ -37,6 +38,7 @@ import nextflow.file.FileHelper
3738
* @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
3839
*/
3940
@Slf4j
41+
@CompileStatic
4042
class GraphObserver implements TraceObserverV2 {
4143

4244
static public final String DEF_FILE_NAME = "dag-${TraceHelper.launchTimestampFmt()}.html"

plugins/nf-tower/src/main/io/seqera/tower/plugin/TowerFactory.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TowerFactory implements TraceObserverFactoryV2 {
5050
if( !client )
5151
return Collections.emptyList()
5252

53-
final result = new ArrayList(1)
53+
final result = new ArrayList<TraceObserverV2>(1)
5454
// create the tower client
5555
result.add(client)
5656
// create the logs checkpoint

0 commit comments

Comments
 (0)