Skip to content

Commit 5cc0962

Browse files
committed
Debug test failure
1 parent bae59c2 commit 5cc0962

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/run/AbstractCommandWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public ProcessBuilder getProcessBuilder(List<String> params)
117117

118118
if (getWorkingDir() != null)
119119
{
120-
getLogger().debug("using working directory: " + getWorkingDir().getPath());
120+
getLogger().log(_logLevel, "using working directory: " + getWorkingDir().getPath());
121121
pb.directory(getWorkingDir());
122122
}
123123

@@ -208,8 +208,8 @@ private void setPath(ProcessBuilder pb)
208208

209209
if (_logPath)
210210
{
211-
getLogger().debug("Existing PATH: " + path);
212-
getLogger().debug("toolDir: " + toolDir);
211+
getLogger().log(_logLevel, "Existing PATH: " + path);
212+
getLogger().log(_logLevel, "toolDir: " + toolDir);
213213
}
214214

215215
if (path == null)
@@ -234,7 +234,7 @@ private void setPath(ProcessBuilder pb)
234234

235235
if (_logPath)
236236
{
237-
getLogger().debug("using path: " + path);
237+
getLogger().log(_logLevel, "using path: " + path);
238238
}
239239
pb.environment().put("PATH", path);
240240
}

jbrowse/src/org/labkey/jbrowse/JBrowseManager.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ public void testJBrowseCli() throws Exception
253253
// Repeat without output going direct to the server log:
254254
try
255255
{
256+
_log.info("Retrying without all output direct to the system log:");
256257
wrapper.execute(Arrays.asList(exe.getPath(), "help"));
257258
}
258259
catch (Exception e)
@@ -277,11 +278,6 @@ public File getBaseDir(Container c, boolean doCreate)
277278
return null;
278279
}
279280

280-
if (fileRoot == null || !fileRoot.exists())
281-
{
282-
return null;
283-
}
284-
285281
File jbrowseDir = new File(fileRoot, ".jbrowse");
286282
if (!jbrowseDir.exists())
287283
{

0 commit comments

Comments
 (0)