#98 Now including host and port in error messages for loading REST modules

Author: rjrudin

src/main/java/com/marklogic/client/ext/modulesloader/impl/DefaultModulesLoader.java

@@ -569,7 +569,7 @@ protected void executeTask(Runnable r) {
 			try {
 				r.run();
 			} catch (Exception e) {
-				failureListeners.forEach(listener -> listener.processFailure(e));
+				failureListeners.forEach(listener -> listener.processFailure(e, this.client));
 			}
 		});
 	}

src/main/java/com/marklogic/client/ext/modulesloader/impl/LoadModulesFailureListener.java

@@ -1,11 +1,13 @@
 package com.marklogic.client.ext.modulesloader.impl;
 
+import com.marklogic.client.DatabaseClient;
+
 /**
- * Ideally this would just have been a Consumer that receives an instance of Throwable. And also, it's only for
- * loading REST modules, which DefaultModulesLoader loads by default in parallel.
+ * This is just for loading REST modules, which DefaultModulesLoader loads by default in parallel. The DatabaseClient
+ * is provided so that the implementation can e.g. capture information about the host and port in use.
  */
 public interface LoadModulesFailureListener {
 
-	void processFailure(Throwable throwable);
+	void processFailure(Throwable throwable, DatabaseClient databaseClient);
 
 }

src/main/java/com/marklogic/client/ext/modulesloader/impl/SimpleLoadModulesFailureListener.java

@@ -1,5 +1,6 @@
 package com.marklogic.client.ext.modulesloader.impl;
 
+import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.ext.helper.LoggingObject;
 
 import java.util.function.Supplier;
@@ -9,12 +10,14 @@ public class SimpleLoadModulesFailureListener extends LoggingObject implements L
 	private Throwable firstThrowable;
 
 	@Override
-	public void processFailure(Throwable throwable) {
+	public void processFailure(Throwable throwable, DatabaseClient databaseClient) {
+		final String message = format("Error occurred while loading modules; host: %s; port: %d; cause: %s", databaseClient.getHost(), databaseClient.getPort(), throwable.getMessage());
+		final RuntimeException exception = new RuntimeException(message, throwable);
 		if (firstThrowable == null) {
-			firstThrowable = throwable;
+			firstThrowable = exception;
 		}
 		if (logger.isErrorEnabled()) {
-			logger.error("Error caught while loading modules, cause: " + throwable.getMessage(), throwable);
+			logger.error(message, throwable);
 		}
 	}