commit 5401c4c411644fb8dc755eeb12d222034ed45b2f
author deepakvarshney <51224132+deepakvarshney@users.noreply.github.com> Wed Jun 08 17:23:08 2022 +0530
committer GitHub <noreply@github.com> Wed Jun 08 13:53:08 2022 +0200
tree b1c3f8fb339470447c93395a94bd2e5641b76a5f
parent 56f4d328cf763098bf3ea2c447d9ce4bd05bebdc

Enhancement/felix 6523 (#157)

* making bundleStartedCheck to return TEMPORARILY_UNAVAILABLE instead of WARN to make it consistent with other checks

* return WARN for bundles in RESOLVED state

Co-authored-by: Deepak Varshney <deepakvarsh@adobe.com>

healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java

diff --git a/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java b/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
index 593aefe..c71c232 100644
--- a/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
+++ b/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
@@ -123,7 +123,11 @@
                     if(useCriticalForInactive) {
                         log.critical(msg, msgObjs);
                     } else {
-                        log.temporarilyUnavailable(msg, msgObjs);
+                        if (bundleState == Bundle.RESOLVED) {
+                            log.warn(msg, msgObjs);
+                        } else {
+                            log.temporarilyUnavailable(msg, msgObjs);
+                        }
                     }
                     bundleIsLogged = true;
                     inactiveCount++;

healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java

diff --git a/healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java b/healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java
index c07857b..bd1e669 100644
--- a/healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java
+++ b/healthcheck/generalchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java
@@ -85,7 +85,7 @@
         BundlesStartedCheck check = createCheck(emptyMap());
         Bundle bundle = mockBundle("mybundle", Bundle.RESOLVED);
         Result result = executeCheck(check, bundle);
-        assertThat(result.getStatus(), equalTo(Status.TEMPORARILY_UNAVAILABLE));
+        assertThat(result.getStatus(), equalTo(Status.WARN));
     }
     
     @Test
@@ -114,7 +114,7 @@
     }
     
     @Test
-    public void testWarnResultWithStartingBundle() {
+    public void testTUResultWithStartingBundle() {
         BundlesStartedCheck check = createCheck(emptyMap());
         Bundle bundle = mockBundle("mybundle", Bundle.STARTING);
         Result result = executeCheck(check, bundle);
@@ -123,7 +123,7 @@
     }
     
     @Test
-    public void testWARNResultWithOtherStatuses() {
+    public void testTUResultWithOtherStatuses() {
         BundlesStartedCheck check = createCheck(emptyMap());
         Bundle bundle = mockBundle("mybundle", Bundle.INSTALLED);
         Bundle bundle2 = mockBundle("uninstalledbundle", Bundle.UNINSTALLED);