You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/06/07 12:23:59 UTC

[felix-dev] branch master updated: making bundleStartedCheck to return TEMPORARILY_UNAVAILABLE instead of WARN to make it consistent with other checks (#156)

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 56f4d328cf making bundleStartedCheck to return TEMPORARILY_UNAVAILABLE instead of WARN to make it consistent with other checks (#156)
56f4d328cf is described below

commit 56f4d328cf763098bf3ea2c447d9ce4bd05bebdc
Author: deepakvarshney <51...@users.noreply.github.com>
AuthorDate: Tue Jun 7 17:53:53 2022 +0530

    making bundleStartedCheck to return TEMPORARILY_UNAVAILABLE instead of WARN to make it consistent with other checks (#156)
    
    Co-authored-by: Deepak Varshney <de...@adobe.com>
---
 .../java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java | 2 +-
 .../org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java  | 6 +++---
 2 files changed, 4 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 36fc239e8b..593aefe072 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,7 @@ public class BundlesStartedCheck implements HealthCheck {
                     if(useCriticalForInactive) {
                         log.critical(msg, msgObjs);
                     } else {
-                        log.warn(msg, msgObjs);
+                        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 b55ea4304a..c07857be46 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.WARN));
+        assertThat(result.getStatus(), equalTo(Status.TEMPORARILY_UNAVAILABLE));
     }
     
     @Test
@@ -118,7 +118,7 @@ public class BundlesStartedCheckTest {
         BundlesStartedCheck check = createCheck(emptyMap());
         Bundle bundle = mockBundle("mybundle", Bundle.STARTING);
         Result result = executeCheck(check, bundle);
-        assertThat(result.getStatus(), equalTo(Status.WARN));
+        assertThat(result.getStatus(), equalTo(Status.TEMPORARILY_UNAVAILABLE));
         System.out.println(result);
     }
     
@@ -130,7 +130,7 @@ public class BundlesStartedCheckTest {
         Bundle bundle3 = mockBundle("stoppingbundle", Bundle.STOPPING);
         Bundle bundle4 = mockBundle("startunkownstatebundle", 50);
         Result result = executeCheck(check, bundle, bundle2, bundle3, bundle4);
-        assertThat(result.getStatus(), equalTo(Status.WARN));
+        assertThat(result.getStatus(), equalTo(Status.TEMPORARILY_UNAVAILABLE));
     }
 
     private Hashtable<String, String> withHeader(String key, String value) {