The Unified and Autonomous Development Platform
midwork
Robin Shen33b1b2d7b484
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.javaindex c032a0911e..bb0dd0b20f 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java@@ -1,6 +1,7 @@package io.onedev.server.mail;import com.google.common.base.Joiner;+import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.hazelcast.cluster.MembershipEvent;import com.hazelcast.cluster.MembershipListener;@@ -18,6 +19,7 @@ import io.onedev.server.cluster.ClusterRunnable;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.*;import io.onedev.server.event.Listen;+import io.onedev.server.event.cluster.ConnectionLost;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;@@ -336,6 +338,36 @@ public class DefaultMailManager implements MailManager, Serializable {senderName, references);}+ @Listen+ public void on(ConnectionLost event) {+ if (clusterManager.isLeaderServer()) {+ var server = event.getServer();+ User root = userManager.getRoot();+ String url = settingManager.getSystemSetting().getServerUrl();+ String message = "Server '" + server + "' is part of OneDev cluster, but can not be reached for some reason";+ String htmlBody = String.format(""+ + "OneDev URL: <a href='%s'>%s</a>"+ + "<p style='margin: 16px 0;'>"+ + "<b>Error detail:</b>"+ + "<pre style='font-family: monospace;'>%s</pre>"+ + "<p style='margin: 16px 0;'>"+ + "-- Sent by OneDev",+ url, url, message);+ String textBody = String.format(""+ + "OneDev url: %s\n\n"+ + "Error detail:\n"+ + "%s",+ url, message);++ EmailAddress emailAddress = root.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ sendMail(Lists.newArrayList(emailAddress.getValue()), Lists.newArrayList(),+ Lists.newArrayList(), "[Clustering] Server '" + server + "' can not be reached",+ htmlBody, textBody, null, null, null);+ }+ }+ }+@Transactional@Listenpublic void on(EntityPersisted event) {diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.javaindex 17e44c6335..6d0d0c98dd 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java@@ -56,6 +56,7 @@ import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;import javax.inject.Inject;import javax.inject.Singleton;@@ -950,13 +951,13 @@ public class DefaultPersistenceManager implements PersistenceManager, SerializabUser root = userManager.getRoot();String url = settingManager.getSystemSetting().getServerUrl();String htmlBody = String.format(""- + "OneDev url: <a href='%s'>%s</a>"+ + "OneDev URL: <a href='%s'>%s</a>"+ "<p style='margin: 16px 0;'>"+ "<b>Error detail:</b>"+ "<pre style='font-family: monospace;'>%s</pre>"+ "<p style='margin: 16px 0;'>"+ "-- Sent by OneDev",- url, url, Throwables.getStackTraceAsString(e));+ url, url, HtmlEscape.escapeHtml5(Throwables.getStackTraceAsString(e)));String textBody = String.format(""+ "OneDev url: %s\n\n"+ "Error detail:\n"