Merge pull request #505 from hpehl/HAL-1767

HAL-1767: Add active thread count
hal · Jan 31, 2022 · ee57eda · ee57eda
2 parents c05db18 + 198da30
commit ee57eda
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java
@@ -33,14 +33,25 @@
 import static org.jboss.gwt.elemento.core.Elements.h;
 import static org.jboss.gwt.elemento.core.Elements.section;
 import static org.jboss.hal.client.runtime.subsystem.batch.AddressTemplates.BATCH_SUBSYSTEM_TEMPLATE;
-import static org.jboss.hal.dmr.ModelDescriptionConstants.*;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.ACTIVE_COUNT;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.CURRENT_THREAD_COUNT;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_JOB_REPOSITORY;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_THREAD_POOL;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.INCLUDE_RUNTIME;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.LARGEST_THREAD_COUNT;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.MAX_THREADS;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.RECURSIVE;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.RESTART_JOBS_ON_RESUME;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.THREAD_POOL;
 import static org.jboss.hal.dmr.ModelNodeHelper.failSafeGet;
 
 public class BatchPreview extends PreviewContent<SubsystemMetadata> {
 
     private final Dispatcher dispatcher;
     private final StatementContext statementContext;
     private final PreviewAttributes<ModelNode> attributes;
+    private final Utilization activeCount;
     private final Utilization currentThreadCount;
     private final Utilization largestThreadCount;
     private final HTMLElement details;
@@ -55,8 +66,10 @@ public BatchPreview(Dispatcher dispatcher, StatementContext statementContext, Re
 
         details = section()
                 .add(h(2, Names.THREADS))
-                .add(currentThreadCount = new Utilization(
+                .add(activeCount = new Utilization(
                         resources.constants().active(), Names.THREADS, false, true))
+                .add(currentThreadCount = new Utilization(
+                        resources.constants().current(), Names.THREADS, false, true))
                 .add(largestThreadCount = new Utilization(
                         resources.constants().largest(), Names.THREADS, false, true)).element();
 
@@ -82,8 +95,10 @@ public void update(SubsystemMetadata item) {
                 if (threadPool.isDefined()) {
                     Elements.setVisible(details, true);
                     int max = threadPool.get(MAX_THREADS).asInt();
+                    int active = threadPool.get(ACTIVE_COUNT).asInt();
                     int current = threadPool.get(CURRENT_THREAD_COUNT).asInt();
                     int largest = threadPool.get(LARGEST_THREAD_COUNT).asInt();
+                    activeCount.update(active, max);
                     currentThreadCount.update(current, max);
                     largestThreadCount.update(largest, max);
                 }

diff --git a/resources/src/main/java/org/jboss/hal/resources/Constants.java b/resources/src/main/java/org/jboss/hal/resources/Constants.java
@@ -105,6 +105,7 @@ public interface Constants extends com.google.gwt.i18n.client.Constants {
     String create();
     String createAccount();
     String creationTime();
+    String current();
     String currentPage();
     String data();
     String day();

diff --git a/resources/src/main/resources/org/jboss/hal/resources/Constants.properties b/resources/src/main/resources/org/jboss/hal/resources/Constants.properties
@@ -89,6 +89,7 @@ counter=Counter
 create=Create
 createAccount=Create Account
 creationTime=Creation Time
+current=Current
 currentPage=Current Page
 custom=Custom
 data=Data

diff --git a/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties b/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties
@@ -89,6 +89,7 @@ counter=Zähler
 create=Erstellen
 createAccount=Konto erstellen
 creationTime=Erstellungszeit
+current=Aktuell
 currentPage=Aktuelle Seite
 custom=Benutzerdefiniert
 data=Daten