Skip to content

Enhancement/felix 6523 #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cziegeler merged 3 commits into from
Jun 8, 2022
Merged

Enhancement/felix 6523 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe5b5eb
making bundleStartedCheck to return TEMPORARILY_UNAVAILABLE instead o…
Jun 2, 2022
f9d4f3c
return WARN for bundles in RESOLVED state
Jun 8, 2022
22f4ae5
fix merge conflicts
Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/BundlesStartedCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ public Result execute() {
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++;
Expand Down
6 changes: 3 additions & 3 deletions ...eneralchecks/src/test/java/org/apache/felix/hc/generalchecks/BundlesStartedCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void testWARNResultWithResolvedBundle() {
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
Expand Down Expand Up @@ -114,7 +114,7 @@ public void testOKResultWithStartingLazyBundle() {
}

@Test
public void testWarnResultWithStartingBundle() {
public void testTUResultWithStartingBundle() {
BundlesStartedCheck check = createCheck(emptyMap());
Bundle bundle = mockBundle("mybundle", Bundle.STARTING);
Result result = executeCheck(check, bundle);
Expand All @@ -123,7 +123,7 @@ public void testWarnResultWithStartingBundle() {
}

@Test
public void testWARNResultWithOtherStatuses() {
public void testTUResultWithOtherStatuses() {
BundlesStartedCheck check = createCheck(emptyMap());
Bundle bundle = mockBundle("mybundle", Bundle.INSTALLED);
Bundle bundle2 = mockBundle("uninstalledbundle", Bundle.UNINSTALLED);
Expand Down