reword log messages to identify hosts without implying connection #999

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java

@@ -156,7 +156,7 @@ private void retry(QueryEvent queryEvent, boolean callFailListeners) {
     // we're obviously not done with this forest
     forestIsDone.get(retryForest).set(false);
     long start = queryEvent.getForestResultsSoFar() + 1;
-    logger.trace("retryForest: {}, retryHost: {}, start: {}",
+    logger.trace("retryForest {} on retryHost {} at start {}",
       retryForest.getForestName(), retryForest.getPreferredHost(), start);
     QueryTask runnable = new QueryTask(getMoveMgr(), this, retryForest, query,
       queryEvent.getForestBatchNumber(), start, queryEvent.getJobBatchNumber(), callFailListeners);
@@ -428,7 +428,7 @@ public synchronized QueryBatcher withForestConfig(ForestConfiguration forestConf
       if ( forestResults.get(forest) == null ) forestResults.put(forest, new AtomicLong());
       if ( forestIsDone.get(forest) == null  ) forestIsDone.put(forest, new AtomicBoolean(false));
     }
-    logger.info("(withForestConfig) Using {} hosts with forests for \"{}\"", hosts.keySet(), forests[0].getDatabaseName());
+    logger.info("(withForestConfig) Using forests on {} hosts for \"{}\"", hosts.keySet(), forests[0].getDatabaseName());
     List<DatabaseClient> newClientList = new ArrayList<>();
     for ( String host : hosts.keySet() ) {
       Forest forest = hosts.get(host);

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java

@@ -805,7 +805,7 @@ public synchronized WriteBatcher withForestConfig(ForestConfiguration forestConf
         removedHostInfos.put(hostInfo.hostName, hostInfo);
       }
     }
-    logger.info("(withForestConfig) Using {} hosts with forests for \"{}\"", hosts.keySet(), forests[0].getDatabaseName());
+    logger.info("(withForestConfig) Using forests on {} hosts for \"{}\"", hosts.keySet(), forests[0].getDatabaseName());
     // initialize a DatabaseClient for each host
     HostInfo[] newHostInfos = new HostInfo[hosts.size()];
     int i=0;
@@ -819,8 +819,10 @@ public synchronized WriteBatcher withForestConfig(ForestConfiguration forestConf
         Forest forest = hosts.get(host);
         // this is a host-specific client (no DatabaseClient is actually forest-specific)
         newHostInfos[i].client = getMoveMgr().getForestClient(forest);
-        logger.info("Adding DatabaseClient on port {} for host \"{}\" to the rotation",
-          newHostInfos[i].client.getPort(), host);
+        if (getMoveMgr().getConnectionType() == DatabaseClient.ConnectionType.DIRECT) {
+          logger.info("Adding DatabaseClient on port {} for host \"{}\" to the rotation",
+                newHostInfos[i].client.getPort(), host);
+        }
       }
       i++;
     }
@@ -1052,7 +1054,7 @@ public void run() {
             transaction = transactionInfo.transaction;
             transactionInfo.written.set(true);
           }
-          logger.trace("begin write batch {} to host \"{}\"", writeSet.getBatchNumber(), writeSet.getClient().getHost());
+          logger.trace("begin write batch {} to forest on host \"{}\"", writeSet.getBatchNumber(), writeSet.getClient().getHost());
           if ( writeSet.getTemporalCollection() == null ) {
             writeSet.getClient().newDocumentManager().write(
               writeSet.getWriteSet(), writeSet.getTransform(), transaction
@@ -1077,7 +1079,7 @@ public void run() {
           throw new DataMovementException("Failed to write because transaction already underwent commit or rollback", null);
         }
       } catch (Throwable t) {
-        logger.trace("failed batch sent to host \"{}\"", writeSet.getClient().getHost());
+        logger.trace("failed batch sent to forest on host \"{}\"", writeSet.getClient().getHost());
         Consumer<Throwable> onFailure = writeSet.getOnFailure();
         if ( onFailure != null ) {
           onFailure.accept(t);