[felix-dev] branch master updated: Enhancement/felix 6523 (#157)

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 5401c4c411 Enhancement/felix 6523 (#157)
5401c4c411 is described below

commit 5401c4c411644fb8dc755eeb12d222034ed45b2f
Author: deepakvarshney <51224132+deepakvarsh...@users.noreply.github.com>
AuthorDate: Wed Jun 8 17:23:08 2022 +0530

    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 <deepakva...@adobe.com>
---
 .../java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java | 6 +++++-
 .../org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java  | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

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 593aefe072..c71c23241c 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 @@ public class BundlesStartedCheck implements HealthCheck {
                     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++;
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 c07857be46..bd1e66962f 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 @@ public class BundlesStartedCheckTest {
         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 @@ public class BundlesStartedCheckTest {
     }
     
     @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 @@ public class BundlesStartedCheckTest {
     }
     
     @Test
-    public void testWARNResultWithOtherStatuses() {
+    public void testTUResultWithOtherStatuses() {
         BundlesStartedCheck check = createCheck(emptyMap());
         Bundle bundle = mockBundle("mybundle", Bundle.INSTALLED);
         Bundle bundle2 = mockBundle("uninstalledbundle", Bundle.UNINSTALLED);