fixed #268 - mark failed mlcp as ERROR

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/StatusListener.java

@@ -3,4 +3,5 @@
 public interface StatusListener {
 
     public void onStatusChange(int percentComplete, String message);
+    public void onError();
 }

quick-start/src/main/java/com/marklogic/quickstart/service/MlcpTasklet.java

@@ -22,6 +22,7 @@ public class MlcpTasklet implements Tasklet {
     private JsonNode mlcpOptions;
     private JobStatusListener statusListener;
     private ArrayList<String> mlcpOutput = new ArrayList<>();
+    private boolean hasError = false;
 
     public MlcpTasklet(HubConfig hubConfig, JsonNode mlcpOptions, JobStatusListener statusListener) {
         this.hubConfig = hubConfig;
@@ -51,6 +52,11 @@ public void onStatusChange(int percentComplete, String message) {
                 mlcpOutput.add(message);
                 statusListener.onStatusChange(jobId, percentComplete, message);
             }
+
+            @Override
+            public void onError() {
+                hasError = true;
+            }
         }, sysout);
         PrintStream ps = new PrintStream(sos);
         System.setOut(ps);
@@ -68,6 +74,10 @@ public void onStatusChange(int percentComplete, String message) {
         System.setOut(sysout);
         statusListener.onStatusChange(jobId, 100, "");
 
+        RepeatStatus status = RepeatStatus.FINISHED;
+        if (hasError) {
+            throw new Exception("Error in Mlcp Execution");
+        }
         return RepeatStatus.FINISHED;
     }
 }

quick-start/src/main/java/com/marklogic/quickstart/util/MlcpOutputStreamInterceptor.java

@@ -35,6 +35,9 @@ public synchronized void write(byte b[], int off, int len) {
 
         byte[] buf = Arrays.copyOfRange(b, off, off + len - 1);
         String status = new String(buf);
+        if (status.contains("ERROR")) {
+            listener.onError();
+        }
 
         try {
             int pc = Integer.parseInt(status.replaceFirst(".*completed (\\d+)\\%", "$1"));

quick-start/src/main/java/com/marklogic/quickstart/web/ProjectsController.java

@@ -174,6 +174,9 @@ public ResponseEntity<?> install(@PathVariable int projectId,
             public void onStatusChange(int percentComplete, String message) {
                 template.convertAndSend("/topic/install-status", new StatusMessage(percentComplete, message));
             }
+
+            @Override
+            public void onError() {}
         });
 
         envConfig.setInitialized(installed);
@@ -206,6 +209,9 @@ public ResponseEntity<?> unInstall(@PathVariable int projectId,
             public void onStatusChange(int percentComplete, String message) {
                 template.convertAndSend("/topic/uninstall-status", new StatusMessage(percentComplete, message));
             }
+
+            @Override
+            public void onError() {}
         });
         return new ResponseEntity<>(HttpStatus.OK);
     }

quick-start/src/main/resources/logback.xml

@@ -18,6 +18,7 @@
   <logger name="com.marklogic.appdeployer" level="INFO"/>
   <logger name="com.marklogic.hub" level="INFO"/>
   <logger name="com.marklogic.contentpump" level="INFO"/>
+  <logger name="org.apache.catalina.webresources.Cache" level="SEVERE"/>
 
   <root level="WARN">
     <appender-ref ref="STDOUT" />