Skip to content
Snippets Groups Projects
Commit fc9b3132 authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

Fix logging

parent d96cb238
No related branches found
No related tags found
No related merge requests found
...@@ -10,12 +10,17 @@ import java.util.Map; ...@@ -10,12 +10,17 @@ import java.util.Map;
import javax.xml.rpc.ServiceException; import javax.xml.rpc.ServiceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cz.it4i.fiji.haas_java_client.HaaSClient.SynchronizableFiles; import cz.it4i.fiji.haas_java_client.HaaSClient.SynchronizableFiles;
import cz.it4i.fiji.haas_java_client.proxy.JobFileContentExt; import cz.it4i.fiji.haas_java_client.proxy.JobFileContentExt;
public class TestHaaSJavaClient { public class TestHaaSJavaClient {
private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestHaaSJavaClient.class);
public static void main(String[] args) throws ServiceException, IOException { public static void main(String[] args) throws ServiceException, IOException {
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("inputParam", "someStringParam"); params.put("inputParam", "someStringParam");
...@@ -42,7 +47,7 @@ public class TestHaaSJavaClient { ...@@ -42,7 +47,7 @@ public class TestHaaSJavaClient {
if (info.getState() == JobState.Finished) { if (info.getState() == JobState.Finished) {
client.download(jobId,workDir); client.download(jobId,workDir);
} }
System.out.println("JobId :" + jobId + ", state" + info.getState()); log.info("JobId :" + jobId + ", state" + info.getState());
} while (info.getState() != JobState.Canceled && info.getState() != JobState.Failed } while (info.getState() != JobState.Canceled && info.getState() != JobState.Failed
&& info.getState() != JobState.Finished); && info.getState() != JobState.Finished);
} }
...@@ -55,10 +60,10 @@ public class TestHaaSJavaClient { ...@@ -55,10 +60,10 @@ public class TestHaaSJavaClient {
} }
private static void showJFC(JobFileContentExt file) { private static void showJFC(JobFileContentExt file) {
System.out.println("File: " + file.getFileType() + ", " + file.getRelativePath()); log.info("File: " + file.getFileType() + ", " + file.getRelativePath());
System.out.println("TaskInfoId: " + file.getSubmittedTaskInfoId()); log.info("TaskInfoId: " + file.getSubmittedTaskInfoId());
System.out.println("Offset: " + file.getOffset()); log.info("Offset: " + file.getOffset());
System.out.println("Content: " + file.getContent()); log.info("Content: " + file.getContent());
} }
} }
...@@ -8,11 +8,16 @@ import java.util.Collections; ...@@ -8,11 +8,16 @@ import java.util.Collections;
import javax.xml.rpc.ServiceException; import javax.xml.rpc.ServiceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cz.it4i.fiji.haas_java_client.HaaSClient.SynchronizableFiles; import cz.it4i.fiji.haas_java_client.HaaSClient.SynchronizableFiles;
import cz.it4i.fiji.haas_java_client.proxy.JobFileContentExt; import cz.it4i.fiji.haas_java_client.proxy.JobFileContentExt;
public class TestHaaSJavaClientWithSPIM { public class TestHaaSJavaClientWithSPIM {
private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestHaaSJavaClientWithSPIM.class);
public static void main(String[] args) throws ServiceException, IOException { public static void main(String[] args) throws ServiceException, IOException {
HaaSClient client = new HaaSClient(TestingConstants.getSettings(2, 9600, 6l, "DD-17-31")); HaaSClient client = new HaaSClient(TestingConstants.getSettings(2, 9600, 6l, "DD-17-31"));
Path baseDir = Paths.get("/home/koz01/Work/vyzkumnik/fiji/work/aaa"); Path baseDir = Paths.get("/home/koz01/Work/vyzkumnik/fiji/work/aaa");
...@@ -42,7 +47,7 @@ public class TestHaaSJavaClientWithSPIM { ...@@ -42,7 +47,7 @@ public class TestHaaSJavaClientWithSPIM {
if (info.getState() == JobState.Finished) { if (info.getState() == JobState.Finished) {
client.download(jobId, workDir); client.download(jobId, workDir);
} }
System.out.println("JobId :" + jobId + ", state" + info.getState()); log.info("JobId :" + jobId + ", state" + info.getState());
firstIteration = false; firstIteration = false;
} while (info.getState() != JobState.Canceled && info.getState() != JobState.Failed } while (info.getState() != JobState.Canceled && info.getState() != JobState.Failed
&& info.getState() != JobState.Finished); && info.getState() != JobState.Finished);
...@@ -67,10 +72,10 @@ public class TestHaaSJavaClientWithSPIM { ...@@ -67,10 +72,10 @@ public class TestHaaSJavaClientWithSPIM {
} }
private static void showJFC(JobFileContentExt file) { private static void showJFC(JobFileContentExt file) {
System.out.println("File: " + file.getFileType() + ", " + file.getRelativePath()); log.info("File: " + file.getFileType() + ", " + file.getRelativePath());
System.out.println("TaskInfoId: " + file.getSubmittedTaskInfoId()); log.info("TaskInfoId: " + file.getSubmittedTaskInfoId());
System.out.println("Offset: " + file.getOffset()); log.info("Offset: " + file.getOffset());
System.out.println("Content: " + file.getContent()); log.info("Content: " + file.getContent());
} }
} }
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