[Community wps-remote] WPS Remote: Logging - propagate messages to th…

…e listeners
geoserver · Nov 8, 2018 · 5b55ad6 · 5b55ad6
1 parent 9c4d473
commit 5b55ad6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/RemoteProcess.java b/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/RemoteProcess.java
@@ -12,6 +12,7 @@
 import java.util.logging.Logger;
 import org.geotools.process.Process;
 import org.geotools.process.ProcessException;
+import org.geotools.util.SimpleInternationalString;
 import org.geotools.util.logging.Logging;
 import org.opengis.feature.type.Name;
 import org.opengis.util.ProgressListener;
@@ -183,7 +184,7 @@ public void setOutputs(Map<String, Object> outputs) {
 
     @Override
     public void progress(final String pId, final Double progress) {
-        if (pId.equals(pid)) {
+        if (pId != null && pId.equals(pid)) {
             listener.progress(progress.floatValue());
         }
 
@@ -194,7 +195,7 @@ public void progress(final String pId, final Double progress) {
 
     @Override
     public void complete(String pId, Object outputs) {
-        if (pId.equals(pid)) {
+        if (pId != null && pId.equals(pid)) {
             listener.complete();
 
             try {
@@ -240,4 +241,11 @@ public void exceptionOccurred(final String pId, Exception cause, Map<String, Obj
         }
         doneSignal.countDown();
     }
+
+    @Override
+    public void setTask(String pId, String logMessage) {
+        if (pId != null && pId.equals(pid)) {
+            listener.setTask(new SimpleInternationalString(logMessage));
+        }
+    }
 }
diff --git a/...munity/wps-remote/src/main/java/org/geoserver/wps/remote/RemoteProcessClientListener.java b/...munity/wps-remote/src/main/java/org/geoserver/wps/remote/RemoteProcessClientListener.java
@@ -48,4 +48,13 @@ public interface RemoteProcessClientListener {
      * @param metadata
      */
     public void exceptionOccurred(final String pId, Exception cause, Map<String, Object> metadata);
+
+    /**
+     * Expose a log message to the {@link RemoteProcess} progress listener associated to the remote
+     * service with the unique @param pId
+     *
+     * @param pId
+     * @param logMessage
+     */
+    public void setTask(final String pId, final String logMessage);
 }
diff --git a/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/plugin/XMPPErrorMessage.java b/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/plugin/XMPPErrorMessage.java
@@ -52,6 +52,7 @@ public void handleSignal(
 
         // NOTIFY LISTENERS
         for (RemoteProcessClientListener listener : xmppClient.getRemoteClientListeners()) {
+            listener.setTask(pID, cause.getLocalizedMessage());
             listener.exceptionOccurred(pID, cause, metadata);
         }
     }

diff --git a/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/plugin/XMPPLogMessage.java b/src/community/wps-remote/src/main/java/org/geoserver/wps/remote/plugin/XMPPLogMessage.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.geoserver.wps.remote.RemoteProcessClientListener;
 import org.geotools.util.logging.Logging;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
@@ -47,9 +48,14 @@ public void handleSignal(
                 LOGGER.fine(
                         "Could not correctly parse the Log level; using the default one 'INFO'.");
             }
-            LOGGER.log(
-                    logLevel,
-                    "[" + pID + "]" + URLDecoder.decode(signalArgs.get("message"), "UTF-8"));
+            String logMessage =
+                    "[" + pID + "]" + URLDecoder.decode(signalArgs.get("message"), "UTF-8");
+            LOGGER.log(logLevel, logMessage);
+
+            // NOTIFY LISTENERS
+            for (RemoteProcessClientListener listener : xmppClient.getRemoteClientListeners()) {
+                listener.setTask(pID, logMessage);
+            }
         } catch (Exception e) {
             LOGGER.log(
                     Level.SEVERE,