fix logging

cip4 · Oct 1, 2024 · ca34332 · ca34332
1 parent 71aed16
commit ca34332
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/org/cip4/bambi/core/AbstractDevice.java b/src/main/java/org/cip4/bambi/core/AbstractDevice.java
@@ -2421,18 +2421,12 @@ public SingleProcess(final AbstractDeviceProcessor p)
 		@Override
 		public void run()
 		{
+			incNumRequests();
 			final boolean result = p.processExistingQueueEntry();
-			p.stopProcessing(result ? EnumNodeStatus.Completed : EnumNodeStatus.Aborted);
-			log.info("completed processing " + getQueueProcessor().getTotalEntryCount());
-			for (final Object o : EnumQueueEntryStatus.getEnumList())
-			{
-				final EnumQueueEntryStatus s = (EnumQueueEntryStatus) o;
-				final int numEntries = getQueueProcessor().getQueue().numEntries(s);
-				if (numEntries > 0)
-				{
-					log.info("completed processing " + s.getName() + " " + numEntries);
-				}
-			}
+			final EnumNodeStatus newStatus = result ? EnumNodeStatus.Completed : EnumNodeStatus.Aborted;
+			p.stopProcessing(newStatus);
+			final JDFQueue queue = getQueueProcessor().getQueue();
+			log.info(newStatus.getName() + " processing " + queue.numEntries(EnumQueueEntryStatus.getEnum(newStatus.getName())) + " / " + getQueueProcessor().getTotalEntryCount());
 		}
 	}
 

diff --git a/src/test/java/org/cip4/bambi/BambiTestDevice.java b/src/test/java/org/cip4/bambi/BambiTestDevice.java
@@ -74,6 +74,7 @@
 import org.cip4.bambi.workers.WorkerDeviceProcessor;
 import org.cip4.bambi.workers.sim.SimDeviceProcessor;
 import org.cip4.jdflib.auto.JDFAutoQueueEntry.EnumQueueEntryStatus;
+import org.cip4.jdflib.jmf.JDFQueue;
 import org.cip4.jdflib.util.ContainerUtil;
 
 public class BambiTestDevice extends WorkerDevice
@@ -96,8 +97,10 @@ public BambiTestDevice()
 	{
 		super(new BambiTestProp());
 		sim = false;
-		getQueueProcessor().getQueue().resumeQueue();
-		getQueueProcessor().getQueue().openQueue();
+		JDFQueue queue = getQueueProcessor().getQueue();
+		queue.resumeQueue();
+		queue.openQueue();
+		queue.flush();
 		finalStatus = EnumQueueEntryStatus.Completed;
 
 	}