Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-10 10:22:04 +02:00
Code Issues Packages Projects Releases Activity

Notify user about results of manually executed health check (#2044)

Browse Source 
When manually starting health checks, the user should always receive a notification about the status, whether successful or not.
This commit is contained in:
Florian Scholdei
2022-05-25 09:30:45 +02:00
committed by GitHub
parent bd68c301ea
commit 6216945f0d
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/notify_current_user.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: changed
description: Notify user about results of manually executed health check ([#2044](https://github.com/scm-manager/scm-manager/pull/2044))

18
scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
View File

@@ -227,22 +227,28 @@ final class HealthChecker {
}
private void notifyCurrentUser(Repository repository, HealthCheckResult result) {
if (!(repository.isHealthy() && result.isHealthy())) {
String currentUser = SecurityUtils.getSubject().getPrincipal().toString();
if (!scmConfiguration.getEmergencyContacts().contains(currentUser)) {
notificationSender.send(getHealthCheckFailedNotification(repository));
}
if (repository.isHealthy() && result.isHealthy()) {
notificationSender.send(getHealthCheckSuccessNotification(repository));
} else {
notificationSender.send(getHealthCheckFailedNotification(repository));
}
}
private void notifyEmergencyContacts(Repository repository) {
String currentUser = SecurityUtils.getSubject().getPrincipal().toString();
Set<String> emergencyContacts = scmConfiguration.getEmergencyContacts();
for (String user : emergencyContacts) {
notificationSender.send(getHealthCheckFailedNotification(repository), user);
if (!user.equals(currentUser)) {
notificationSender.send(getHealthCheckFailedNotification(repository), user);
}
}
}
private Notification getHealthCheckFailedNotification(Repository repository) {
return new Notification(Type.ERROR, "/repo/" + repository.getNamespaceAndName() + "/settings/general", "healthCheckFailed");
}
private Notification getHealthCheckSuccessNotification(Repository repository) {
return new Notification(Type.SUCCESS, "/repo/" + repository.getNamespaceAndName() + "/settings/general", "healthCheckSuccess");
}
}

3
scm-webapp/src/main/resources/locales/de/plugins.json
View File

@@ -480,7 +480,8 @@
"notifications": {
"exportFinished": "Der Repository Export wurde abgeschlossen.",
"exportFailed": "Der Repository Export ist fehlgeschlagen. Versuchen Sie es erneut oder wenden Sie sich an einen Administrator.",
"healthCheckFailed": "Der Repository Health Check ist fehlgeschlagen."
"healthCheckFailed": "Der Repository Health Check ist fehlgeschlagen.",
"healthCheckSuccess": "Der Repository Health Check war erfolgreich."
},
"search": {
"types": {

3
scm-webapp/src/main/resources/locales/en/plugins.json
View File

@@ -424,7 +424,8 @@
"notifications": {
"exportFinished": "The repository export has been finished.",
"exportFailed": "The repository export has failed. Try it again or contact your administrator.",
"healthCheckFailed": "The repository health check has failed."
"healthCheckFailed": "The repository health check has failed.",
"healthCheckSuccess": "The repository health check was successful."
},
"search": {
"types": {

7
scm-webapp/src/test/java/sonia/scm/repository/HealthCheckerTest.java
View File

@@ -119,6 +119,7 @@ class HealthCheckerTest {
@Test
void shouldComputeLightChecks() {
when(subject.getPrincipal()).thenReturn("trillian");
when(healthCheck1.check(repository)).thenReturn(HealthCheckResult.unhealthy(createFailure("error1")));
when(healthCheck2.check(repository)).thenReturn(HealthCheckResult.unhealthy(createFailure("error2")));
@@ -261,8 +262,8 @@ class HealthCheckerTest {
checker.fullCheck(repositoryId);
verify(notificationSender, never()).send(any());
verify(notificationSender,times(1)).send(any(), eq("trillian"));
verify(notificationSender, times(1)).send(any());
verify(notificationSender, never()).send(any(), eq("trillian"));
}
@Test
@@ -274,7 +275,7 @@ class HealthCheckerTest {
checker.fullCheck(repositoryId);
verify(notificationSender).send(any(), eq("trillian"));
verify(notificationSender).send(any());
verify(notificationSender).send(any(), eq("Arthur"));
}
}