Logging changes and unit tests

[dmaap/datarouter.git] / datarouter-node / src / main / java / org / onap / dmaap / datarouter / node / Delivery.java

diff --git a/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
index df73c1e..82a4e9f 100644 (file)
--- a/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 @@ import com.att.eelf.configuration.EELFManager;
 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 @@ 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;
@@ -126,15 +126,15 @@ public class Delivery {
         DelItem[] items = cv.toArray(new DelItem[cv.size()]);
         Arrays.sort(items);
         long stop = (long) (tspace * fdstop);
-        logger.info(
+        logger.warn(
                 "NODE0501 Free disk space below red threshold.  current=" + cur + " red=" + start + TOTAL + tspace);
         if (determineFreeDiskSpace(spoolfile, tspace, stop, cur, items)) {
             return;
         }
         cur = spoolfile.getUsableSpace();
         if (cur >= stop) {
-            logger.info("NODE0503 Free disk space at or above yellow threshold.  current=" + cur + YELLOW + stop
-                    + TOTAL + tspace);
+            logger.warn("NODE0503 Free disk space at or above yellow threshold.  current=" + cur + YELLOW + stop
+                                + TOTAL + tspace);
             return;
         }
         logger.warn(
@@ -178,7 +178,7 @@ public class Delivery {
         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 @@ public class Delivery {
         cleardirs();
         while (curthreads < threads) {
             curthreads++;
-            (new Thread("Delivery Thread") {
+            (new Thread("del-thread-" + curthreads) {
                 @Override
                 public void run() {
                     dodelivery();
@@ -248,15 +248,15 @@ public class Delivery {
     private boolean determineFreeDiskSpace(File spoolfile, long tspace, long stop, long cur, DelItem[] items) {
         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");
+            logger.debug("NODE0502 Attempting to discard " + item.getSpool() + "/" + item.getPublishId()
+                                + " to free up disk");
             if (amount > 0) {
                 cur += amount;
                 if (cur >= stop) {
                     cur = spoolfile.getUsableSpace();
                 }
                 if (cur >= stop) {
-                    logger.info(
+                    logger.warn(
                             "NODE0503 Free disk space at or above yellow threshold.  current=" + cur + YELLOW + stop
                                     + TOTAL + tspace);
                     return true;
@@ -266,7 +266,7 @@ public class Delivery {
         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 @@ public class Delivery {
             }
             DelItem delItem = (DelItem) object;
             return Objects.equals(pubid, delItem.pubid)
-                    && Objects.equals(getSpool(), delItem.getSpool());
+                           && Objects.equals(getSpool(), delItem.getSpool());
         }
 
         @Override