#102 Now logging the port/database when making calls to ML

Author: rjrudin

src/main/java/com/marklogic/client/ext/batch/DefaultBatchHandler.java

@@ -38,17 +38,23 @@ public void handleBatch(DatabaseClient client, List<? extends DocumentWriteOpera
 		for (DocumentWriteOperation item : items) {
 			set.add(item);
 		}
+
 		int count = set.size();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Writing " + count + " documents to MarkLogic");
+		String connectionInfo = format("port: %d", client.getPort());
+		if (client.getDatabase() != null) {
+			connectionInfo += format("; database: %s", client.getDatabase());
+		}
+
+		if (logger.isInfoEnabled()) {
+			logger.info("Writing " + count + " documents to MarkLogic; " + connectionInfo);
 		}
 		if (serverTransform != null) {
 			mgr.write(set, serverTransform);
 		} else {
 			mgr.write(set);
 		}
 		if (logger.isInfoEnabled()) {
-			logger.info("Wrote " + count + " documents to MarkLogic");
+			logger.info("Wrote " + count + " documents to MarkLogic; " + connectionInfo);
 		}
 	}
 

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

@@ -222,7 +222,7 @@ protected void loadProperties(Modules modules, Set<Resource> loadedModules) {
 		}
 
 		if (logger.isInfoEnabled()) {
-			logger.info("Writing REST server configuration");
+			logger.info("Writing REST server configuration to MarkLogic; " + getDatabaseClientInfo(client));
 			logger.info("Default document read transform: " + mgr.getDefaultDocumentReadTransform());
 			logger.info("Transform all documents on read: " + mgr.getDefaultDocumentReadTransformAll());
 			logger.info("Validate query options: " + mgr.getQueryOptionValidation());
@@ -232,6 +232,7 @@ protected void loadProperties(Modules modules, Set<Resource> loadedModules) {
 				logger.info("Update policy: " + mgr.getUpdatePolicy().name());
 			}
 		}
+
 		mgr.writeConfiguration();
 
 		if (f != null && modulesManager != null) {
@@ -476,7 +477,13 @@ public Resource installService(Resource r, final ExtensionMetadata metadata, fin
 		logger.info(String.format("Loading %s resource extension from file %s", resourceName, r.getFilename()));
 
 		StringHandle h = new StringHandle(readAndReplaceTokens(r));
-		executeTask(() -> extMgr.writeServices(resourceName, h, metadata, methodParams));
+
+		executeTask(() -> {
+			if (logger.isInfoEnabled()) {
+				logger.info(format("Writing %s resource extension to MarkLogic; %s", resourceName, getDatabaseClientInfo(client)));
+			}
+			extMgr.writeServices(resourceName, h, metadata, methodParams);
+		});
 
 		updateTimestamp(r);
 		return r;
@@ -494,10 +501,13 @@ public Resource installTransform(Resource r, final ExtensionMetadata metadata) {
 		final String filename = r.getFilename();
 		final TransformExtensionsManager mgr = client.newServerConfigManager().newTransformExtensionsManager();
 		final String transformName = getExtensionNameFromFile(r);
-		logger.info(String.format("Loading %s transform from resource %s", transformName, filename));
+		logger.info(format("Loading %s transform from resource %s", transformName, filename));
 
 		StringHandle h = new StringHandle(readAndReplaceTokens(r));
 		executeTask(() -> {
+			if (logger.isInfoEnabled()) {
+				logger.info(format("Writing %s transform to MarkLogic; %s", transformName, getDatabaseClientInfo(client)));
+			}
 			if (FilenameUtil.isXslFile(filename)) {
 				mgr.writeXSLTransform(transformName, h, metadata);
 			} else if (FilenameUtil.isJavascriptFile(filename)) {
@@ -527,6 +537,9 @@ public Resource installQueryOptions(Resource r) {
 
 		StringHandle h = new StringHandle(readAndReplaceTokens(r));
 		executeTask(() -> {
+			if (logger.isInfoEnabled()) {
+				logger.info(format("Writing %s query options to MarkLogic; %s", name, getDatabaseClientInfo(client)));
+			}
 			if (filename.endsWith(".json")) {
 				mgr.writeOptions(name, h.withFormat(Format.JSON));
 			} else {
@@ -723,6 +736,21 @@ private void updateTimestamp(Resource resource) {
 		}
 	}
 
+	/**
+	 * Returns a string that is useful for logging information about the DatabaseClient connection before a call is
+	 * made to load a REST extension.
+	 *
+	 * @param client
+	 * @return
+	 */
+	protected String getDatabaseClientInfo(DatabaseClient client) {
+		String info = format("port: %d", client.getPort());
+		if (client.getDatabase() != null) {
+			info += format("; database: %s", client.getDatabase());
+		}
+		return info;
+	}
+
 	public AssetFileLoader getAssetFileLoader() {
 		return assetFileLoader;
 	}

src/test/java/com/marklogic/client/ext/batch/RestBatchWriterTest.java

@@ -1,13 +1,13 @@
 package com.marklogic.client.ext.batch;
 
-import com.marklogic.client.ext.AbstractIntegrationTest;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.admin.TransformExtensionsManager;
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.document.ServerTransform;
 import com.marklogic.client.document.XMLDocumentManager;
+import com.marklogic.client.ext.AbstractIntegrationTest;
 import com.marklogic.client.impl.DocumentWriteOperationImpl;
 import com.marklogic.client.io.FileHandle;
 import com.marklogic.client.io.Format;
@@ -54,7 +54,6 @@ public void writeDocumentWithTransform() throws IOException {
 		DocumentWriteOperation op = new DocumentWriteOperationImpl(DocumentWriteOperation.OperationType.DOCUMENT_WRITE,
 			"/test.xml", null, new StringHandle("<hello>world</hello>"));
 
-		client = newClient("Documents");
 		RestBatchWriter writer = new RestBatchWriter(client);
 		writer.setServerTransform(new ServerTransform("simple"));
 		writer.setContentFormat(Format.XML);