Skip to content

Commit e6b1781

Browse files
committed
More verbose logging
1 parent e63356f commit e6b1781

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ReferenceGenomeImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public ReferenceGenomeImpl(@NotNull File sourceFasta, @Nullable ExpData fastaExp
4242
_name = name;
4343
}
4444

45+
@Override
4546
public boolean isTemporaryGenome() {
4647
return null == getGenomeId();
4748
}
@@ -116,6 +117,7 @@ public Integer getFastaExpDataId()
116117
return _expDataId;
117118
}
118119

120+
@Override
119121
@JsonIgnore
120122
public File getAlignerIndexDir(String name)
121123
{

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/util/AbstractGenomicsDBImportHandler.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@ public void processFilesOnWebserver(PipelineJob job, SequenceAnalysisJobSupport
429429
@Override
430430
public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext ctx) throws UnsupportedOperationException, PipelineJobException
431431
{
432+
ctx.getLogger().info("Starting GenomicsDbImport: " + (_append ? "append" : "import"));
433+
432434
boolean doCopyGVcfLocal = doCopyLocal(ctx.getParams());
433435

434436
RecordedAction action = new RecordedAction(getName());
@@ -462,6 +464,11 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
462464
File startedFile = new File(destinationWorkspaceFolder.getParentFile(), "genomicsdb.started");
463465
boolean genomicsDbCompleted = doneFile.exists();
464466
boolean genomicsDbStarted = startedFile.exists();
467+
if (genomicsDbStarted)
468+
{
469+
ctx.getLogger().info("GenomicsDB has previously started in this folder");
470+
}
471+
465472
ctx.getFileManager().addIntermediateFile(doneFile);
466473
ctx.getFileManager().addIntermediateFile(startedFile);
467474
if (_append)
@@ -491,13 +498,14 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
491498
//NOTE: if GenomicsDB has started, but dies mid-job, the resulting workspace probably cannot be resumed
492499
if (!genomicsDbStarted && copyDone.exists())
493500
{
494-
ctx.getLogger().info("has been copied, skipping");
501+
ctx.getLogger().info("has been copied, skipping: " + i.getContig());
495502
continue;
496503
}
497504

498505
//Allow the above to complete so we track the .done files
499506
if (genomicsDbCompleted)
500507
{
508+
ctx.getLogger().info("has completed, skipping: " + i.getContig());
501509
continue;
502510
}
503511

@@ -518,6 +526,7 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
518526
FileUtils.deleteDirectory(destContigFolder);
519527
}
520528

529+
ctx.getLogger().info("copying contig folder: " + i.getContig());
521530
FileUtils.copyDirectory(sourceFolder, destContigFolder);
522531
FileUtils.touch(copyDone);
523532
}

0 commit comments

Comments
 (0)