From 27dab9ccd3e08e43a652652e24bc81c1f2d16778 Mon Sep 17 00:00:00 2001 From: Mark Winter <mwinter@drexel.edu> Date: Mon, 4 Oct 2021 12:52:30 +0200 Subject: [PATCH] Added information logging to IJ debug-mode --- .../plugin-ij/src/main/java/net/leverjs/LeverscIJ.java | 10 ++++++++-- .../src/main/java/net/leverjs/LeverscLaunch.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java index 907bf2b..15364ae 100644 --- a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java +++ b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java @@ -116,6 +116,9 @@ public class LeverscIJ implements PlugInFilter int port = base_port + fignum; URL url = new URL("http", host, port, "/loadfig"); + if ( IJ.debugMode ) + IJ.log(String.format("LEVERSC send: %s", url.toString())); + String boundary = "---------------Leversc_" + UUID.randomUUID().toString(); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -134,7 +137,8 @@ public class LeverscIJ implements PlugInFilter // TODO: We don't curently do anything with this response code, but it's important to retrieve it for proper data transmission int status = conn.getResponseCode(); - // IJ.log(String.format("LEVERSC response: %d", status)); + if ( IJ.debugMode ) + IJ.log(String.format("LEVERSC response: %d", status)); conn.disconnect(); } @@ -320,7 +324,8 @@ public class LeverscIJ implements PlugInFilter final Genson genson = new Genson(); String json = genson.serialize(meta); - // IJ.log(String.format("JSON: %s", json)); + if ( IJ.debugMode ) + IJ.log(String.format("LEVERSC JSON Header: %s", json)); return json; } @@ -377,6 +382,7 @@ public class LeverscIJ implements PlugInFilter conn.setConnectTimeout(500); BufferedReader resp_reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); + // TODO: We should verify a version string here once that is properly returned by LEVERSC String resp = read_all_buffered(resp_reader); resp_reader.close(); diff --git a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscLaunch.java b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscLaunch.java index 9fcdc35..731a9ea 100644 --- a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscLaunch.java +++ b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscLaunch.java @@ -145,7 +145,8 @@ public class LeverscLaunch private static boolean exec_process(List<String> cmdArgs) { - IJ.log(String.format("Run Leversc: %s", cmdArgs.toString())); + if ( IJ.debugMode ) + IJ.log(String.format("Launching Leversc: %s", cmdArgs.toString())); String[] strArgs = new String[cmdArgs.size()]; strArgs = cmdArgs.toArray(strArgs); -- GitLab