Skip to content
Snippets Groups Projects
Commit bf0fb53c authored by Petr Bainar's avatar Petr Bainar
Browse files

Merge branch 'iss1129' into 'master'

fix: iss1129

See merge request fiji/haas-java-client!20
parents e0fe8b7d a78196b8
No related branches found
No related tags found
1 merge request!20fix: iss1129
package cz.it4i.fiji.haas_spim_benchmark.core; package cz.it4i.fiji.haas_spim_benchmark.core;
import com.google.common.collect.Streams;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
...@@ -10,8 +12,8 @@ import java.util.Scanner; ...@@ -10,8 +12,8 @@ import java.util.Scanner;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.math3.util.Pair; import org.apache.commons.math3.util.Pair;
import org.slf4j.Logger;
import com.google.common.collect.Streams; import org.slf4j.LoggerFactory;
import cz.it4i.fiji.haas_java_client.JobState; import cz.it4i.fiji.haas_java_client.JobState;
import cz.it4i.fiji.haas_java_client.SynchronizableFileType; import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
...@@ -19,6 +21,9 @@ import cz.it4i.fiji.haas_java_client.SynchronizableFileType; ...@@ -19,6 +21,9 @@ import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
public class TaskComputation { public class TaskComputation {
public static final Logger log = LoggerFactory.getLogger(
cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation.class);
public static class Log { public static class Log {
final private String name; final private String name;
final private String content; final private String content;
...@@ -249,8 +254,10 @@ public class TaskComputation { ...@@ -249,8 +254,10 @@ public class TaskComputation {
} }
} }
scanner.close(); scanner.close();
if (log.isDebugEnabled()) {
return !(inputs == null || id == null); log.debug("Job parameters resolved id = {}, inputs = {}", id, inputs);
}
return id == null;
} }
private String getSnakemakeOutput() { private String getSnakemakeOutput() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment