Skip to content

Commit 64f34cf

Browse files
Removed unused variables, improve test credential handling, refresh blob metadata on OutputStream close
1 parent 9376e82 commit 64f34cf

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

lincs/src/org/labkey/lincs/psp/LincsPspPipelineJob.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.labkey.api.util.FileUtil;
1313
import org.labkey.api.util.URLHelper;
1414
import org.labkey.api.view.ViewBackgroundInfo;
15-
import org.labkey.lincs.LincsModule;
1615

1716
public class LincsPspPipelineJob extends PipelineJob implements LincsPspJobSupport
1817
{
@@ -43,7 +42,7 @@ public LincsPspPipelineJob(ViewBackgroundInfo info, PipeRoot root, ITargetedMSRu
4342

4443
String baseLogFileName = FileUtil.makeFileNameWithTimestamp("LincsPSP_" + (_oldPspJob != null ? "rerun_" : "") + run.getBaseName().replace(" ", "_"));
4544

46-
LocalDirectory localDirectory = LocalDirectory.create(root, LincsModule.NAME, baseLogFileName,
45+
LocalDirectory localDirectory = LocalDirectory.create(root, baseLogFileName,
4746
!root.isCloudRoot() ? root.getRootPath().getAbsolutePath() : FileUtil.getTempDirectory().getPath());
4847
setLocalDirectory(localDirectory);
4948
setLogFile(localDirectory.determineLogFile());

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4712,7 +4712,7 @@ private static File getLocalFile(Container container, String fileName) throws Px
47124712
PipeRoot root = PipelineService.get().getPipelineRootSetting(container);
47134713
if (root != null)
47144714
{
4715-
LocalDirectory localDirectory = LocalDirectory.create(root, PanoramaPublicModule.NAME);
4715+
LocalDirectory localDirectory = LocalDirectory.create(root);
47164716
return new File(localDirectory.getLocalDirectoryFile(), fileName);
47174717
}
47184718
else

panoramapublic/src/org/labkey/panoramapublic/pipeline/CopyExperimentPipelineJob.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.labkey.api.view.ActionURL;
3131
import org.labkey.api.view.NotFoundException;
3232
import org.labkey.api.view.ViewBackgroundInfo;
33-
import org.labkey.panoramapublic.PanoramaPublicModule;
3433
import org.labkey.panoramapublic.model.ExperimentAnnotations;
3534
import org.labkey.panoramapublic.model.Journal;
3635
import org.labkey.vfs.FileLike;
@@ -93,7 +92,7 @@ public CopyExperimentPipelineJob(ViewBackgroundInfo info, PipeRoot root, Experim
9392

9493
// CONSIDER: Add a static factory method to LocalDirectory instead of using the constructor.
9594
// create(@NotNull PipeRoot root, @NotNull String moduleName, @NotNull String baseLogFileName, @NotNull String localDirPath, boolean temporary)
96-
LocalDirectory localDirectory = new LocalDirectory(targetRoot.getContainer(), PanoramaPublicModule.NAME, root, baseLogFileName);
95+
LocalDirectory localDirectory = new LocalDirectory(targetRoot.getContainer(), root, baseLogFileName);
9796

9897
setLocalDirectory(localDirectory);
9998
setLogFile(localDirectory.determineLogFile());

0 commit comments

Comments
 (0)