Merge "Logging improvements"

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
index e401324,9af8ed7..150d2aa
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
@@@ -28,7 -28,7 +28,7 @@@ import com.att.eelf.configuration.EELFM
  import java.io.File;
  import java.util.ArrayList;
  import java.util.Arrays;
 -import java.util.Hashtable;
 +import java.util.HashMap;
  import java.util.Objects;
  
  /**
@@@ -50,7 -50,7 +50,7 @@@ public class Delivery 
      private int threads;
      private int curthreads;
      private NodeConfigManager config;
 -    private Hashtable<String, DeliveryQueue> dqs = new Hashtable<>();
 +    private HashMap<String, DeliveryQueue> dqs = new HashMap<>();
      private DeliveryQueue[] queues = new DeliveryQueue[0];
      private int qpos = 0;
      private long nextcheck;
@@@ -134,7 -134,7 +134,7 @@@
          cur = spoolfile.getUsableSpace();
          if (cur >= stop) {
              logger.info("NODE0503 Free disk space at or above yellow threshold.  current=" + cur + YELLOW + stop
-                     + TOTAL + tspace);
+                                 + TOTAL + tspace);
              return;
          }
          logger.warn(
@@@ -178,7 -178,7 +178,7 @@@
          DestInfo[] alldis = config.getAllDests();
          DeliveryQueue[] nqs = new DeliveryQueue[alldis.length];
          qpos = 0;
 -        Hashtable<String, DeliveryQueue> ndqs = new Hashtable<>();
 +        HashMap<String, DeliveryQueue> ndqs = new HashMap<>();
          for (DestInfo di : alldis) {
              String spl = di.getSpool();
              DeliveryQueue dq = dqs.get(spl);
@@@ -195,7 -195,7 +195,7 @@@
          cleardirs();
          while (curthreads < threads) {
              curthreads++;
-             (new Thread("Delivery Thread") {
+             (new Thread("del-thread-" + curthreads) {
                  @Override
                  public void run() {
                      dodelivery();
@@@ -249,7 -249,7 +249,7 @@@
          for (DelItem item : items) {
              long amount = dqs.get(item.getSpool()).cancelTask(item.getPublishId());
              logger.info("NODE0502 Attempting to discard " + item.getSpool() + "/" + item.getPublishId()
-                     + " to free up disk");
+                                 + " to free up disk");
              if (amount > 0) {
                  cur += amount;
                  if (cur >= stop) {
@@@ -266,7 -266,7 +266,7 @@@
          return false;
      }
  
 -    private static class DelItem implements Comparable<DelItem> {
 +    static class DelItem implements Comparable<DelItem> {
  
          private String pubid;
          private String spool;
@@@ -302,7 -302,7 +302,7 @@@
              }
              DelItem delItem = (DelItem) object;
              return Objects.equals(pubid, delItem.pubid)
-                     && Objects.equals(getSpool(), delItem.getSpool());
+                            && Objects.equals(getSpool(), delItem.getSpool());
          }
  
          @Override