The Unified and Autonomous Development Platform
feat: display alerts if unable to notify adminsitrator via email for critical errors (#1449)
Robin Shenf87b654b93d5
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 053e5f6508..f78924fa1e 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -294,6 +294,7 @@ public class CoreModule extends AbstractPluginModule {bind(IssueTouchManager.class).to(DefaultIssueTouchManager.class);bind(PullRequestTouchManager.class).to(DefaultPullRequestTouchManager.class);bind(CodeCommentTouchManager.class).to(DefaultCodeCommentTouchManager.class);+ bind(AlertManager.class).to(DefaultAlertManager.class);bind(WebHookManager.class);@@ -462,6 +463,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestEventBroadcaster.class);bind(IssueEventBroadcaster.class);bind(BuildEventBroadcaster.class);+ bind(AlertEventBroadcaster.class);bind(UploadItemManager.class).to(DefaultUploadItemManager.class);bind(TerminalManager.class).to(DefaultTerminalManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.javanew file mode 100644index 0000000000..70b0612696--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java@@ -0,0 +1,10 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.Alert;+import io.onedev.server.persistence.dao.EntityManager;++public interface AlertManager extends EntityManager<Alert> {++ void alert(String message);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.javanew file mode 100644index 0000000000..86729e3149--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java@@ -0,0 +1,46 @@+package io.onedev.server.entitymanager.impl;++import com.google.common.base.Preconditions;+import io.onedev.server.entitymanager.AlertManager;+import io.onedev.server.model.Alert;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import org.apache.wicket.request.cycle.RequestCycle;+import org.hibernate.criterion.Restrictions;++import javax.inject.Inject;+import javax.inject.Singleton;++import java.util.Date;++import static io.onedev.server.model.Alert.PROP_MESSAGE;++@Singleton+public class DefaultAlertManager extends BaseEntityManager<Alert> implements AlertManager {++ @Inject+ public DefaultAlertManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void alert(String message) {+ var criteria = newCriteria();+ criteria.add(Restrictions.eq(PROP_MESSAGE, message));+ var alert = find(criteria);+ if (alert == null) {+ alert = new Alert();+ alert.setMessage(message);+ }+ alert.setDate(new Date());+ dao.persist(alert);+ }++ @Override+ public int count() {+ return count(true);+ }+}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 bb0dd0b20f..1b78cfd5a2 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@@ -128,10 +128,12 @@ public class DefaultMailManager implements MailManager, Serializable {private final ClusterManager clusterManager;+ private final AlertManager alertManager;+private volatile Thread thread;@Inject- public DefaultMailManager(TransactionManager transactionManager, SettingManager setingManager,+ public DefaultMailManager(TransactionManager transactionManager, SettingManager settingManager,UserManager userManager, ProjectManager projectManager,UserAuthorizationManager authorizationManager, IssueManager issueManager,IssueCommentManager issueCommentManager, IssueWatchManager issueWatchManager,@@ -139,9 +141,9 @@ public class DefaultMailManager implements MailManager, Serializable {PullRequestWatchManager pullRequestWatchManager, ExecutorService executorService,UrlManager urlManager, EmailAddressManager emailAddressManager,IssueAuthorizationManager issueAuthorizationManager, AttachmentManager attachmentManager,- ClusterManager clusterManager) {+ ClusterManager clusterManager, AlertManager alertManager) {this.transactionManager = transactionManager;- this.settingManager = setingManager;+ this.settingManager = settingManager;this.userManager = userManager;this.projectManager = projectManager;this.authorizationManager = authorizationManager;@@ -157,6 +159,7 @@ public class DefaultMailManager implements MailManager, Serializable {this.issueAuthorizationManager = issueAuthorizationManager;this.attachmentManager = attachmentManager;this.clusterManager = clusterManager;+ this.alertManager = alertManager;}public Object writeReplace() throws ObjectStreamException {@@ -360,10 +363,12 @@ public class DefaultMailManager implements MailManager, Serializable {url, message);EmailAddress emailAddress = root.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {+ if (settingManager.getMailSetting() != null && 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);+ } else {+ alertManager.alert("Server '" + server + "' can not be reached");}}}diff --git a/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java b/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.javaindex ebea4c4977..031ff29a87 100644--- a/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java+++ b/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java@@ -1,5 +1,10 @@package io.onedev.server.mail;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.AlertManager;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.OAuthUtils;public class OAuthAccessToken implements MailCredential {@@ -23,7 +28,14 @@ public class OAuthAccessToken implements MailCredential {@Overridepublic String getValue() {- return OAuthUtils.getAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken);+ try {+ return OAuthUtils.getAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken);+ } catch (ExplicitException e) {+ Long userId = SecurityUtils.getUserId();+ if (userId.equals(0L) || userId.equals(User.SYSTEM_ID))+ OneDev.getInstance(AlertManager.class).alert("Failed to get access token of mail server: " + e.getMessage());+ throw e;+ }}}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex e6c9868773..00a621e8f3 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -5506,6 +5506,6 @@ public class DataMigrator {dom.writeToFile(file, false);}}- }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/Alert.java b/server-core/src/main/java/io/onedev/server/model/Alert.javanew file mode 100644index 0000000000..932cf5f53c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/Alert.java@@ -0,0 +1,53 @@+package io.onedev.server.model;++import io.onedev.server.annotation.Editable;+import org.apache.commons.lang3.StringUtils;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.Table;+import java.util.Date;++import static io.onedev.server.model.Alert.PROP_DATE;+import static io.onedev.server.model.Alert.PROP_MESSAGE;++@Editable+@Entity+@Table(indexes={@Index(columnList=PROP_DATE), @Index(columnList=PROP_MESSAGE)})+public class Alert extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final int MAX_MESSAGE_LEN = 255;++ public static final String PROP_DATE = "date";++ public static final String PROP_MESSAGE = "message";++ private Date date;++ @Column(nullable=false, unique = true, length=MAX_MESSAGE_LEN)+ private String message;++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++ public String getMessage() {+ return message;+ }++ public void setMessage(String message) {+ this.message = StringUtils.abbreviate(message, MAX_MESSAGE_LEN);+ }++ public static String getChangeObservable() {+ return Alert.class.getName();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex ddad066fb1..502fc85ad8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -3,7 +3,6 @@ package io.onedev.server.model.support.administration;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;@@ -28,18 +27,15 @@ import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usage.Usage;-import io.onedev.server.validation.Validatable;import io.onedev.server.web.component.issue.workflowreconcile.*;import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;import java.io.Serializable;import java.util.*;import java.util.stream.Collectors;@Editable-@ClassValidating-public class GlobalIssueSetting implements Serializable, Validatable {+public class GlobalIssueSetting implements Serializable {private static final long serialVersionUID = 1L;@@ -743,12 +739,5 @@ public class GlobalIssueSetting implements Serializable, Validatable {public int getStateOrdinal(String state) {return getStateSpecs().indexOf(getStateSpec(state));}-- @Override- public boolean isValid(ConstraintValidatorContext context) {- context.disableDefaultConstraintViolation();- context.buildConstraintViolationWithTemplate("shit").addPropertyNode("commitMessageFixPatterns").addConstraintViolation();- return false;- }}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 104a8a340d..01ee30846a 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@@ -130,6 +130,8 @@ public class DefaultPersistenceManager implements PersistenceManager, Serializabprivate final TransactionManager transactionManager;+ private final AlertManager alertManager;+private String backupTaskId;@Inject@@ -138,7 +140,7 @@ public class DefaultPersistenceManager implements PersistenceManager, SerializabSettingManager settingManager, MailManager mailManager, TaskScheduler taskScheduler,PasswordService passwordService, RoleManager roleManager, LinkSpecManager linkSpecManager,EmailAddressManager emailAddressManager, UserManager userManager, ClusterManager clusterManager,- TransactionManager transactionManager) {+ TransactionManager transactionManager, AlertManager alertManager) {this.physicalNamingStrategy = physicalNamingStrategy;this.hibernateConfig = hibernateConfig;this.validator = validator;@@ -155,6 +157,7 @@ public class DefaultPersistenceManager implements PersistenceManager, Serializabthis.emailAddressManager = emailAddressManager;this.clusterManager = clusterManager;this.transactionManager = transactionManager;+ this.alertManager = alertManager;}private Metadata getMetadata() {@@ -977,10 +980,12 @@ public class DefaultPersistenceManager implements PersistenceManager, Serializaburl, Throwables.getStackTraceAsString(e));EmailAddress emailAddress = root.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {+ if (settingManager.getMailSetting() != null && emailAddress != null && emailAddress.isVerified()) {mailManager.sendMail(Lists.newArrayList(emailAddress.getValue()), Lists.newArrayList(),Lists.newArrayList(), "[Backup] OneDev Database Auto-backup Failed",htmlBody, textBody, null, null, null);+ } else {+ alertManager.alert("Database auto-backup failed");}}diff --git a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java b/server-core/src/main/java/io/onedev/server/util/OAuthUtils.javaindex 199c713c26..4af544a70a 100644--- a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java@@ -9,6 +9,9 @@ import java.util.List;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.AlertManager;+import org.apache.wicket.request.cycle.RequestCycle;import org.joda.time.DateTime;import com.nimbusds.oauth2.sdk.AuthorizationGrant;diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 1ed9abaffc..05fceda275 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -217,6 +217,8 @@ onedev.server = {});Wicket.Event.subscribe('/ajax/call/done', function() {onedev.server.ajaxRequests.count--;+ if (onedev.server.ajaxRequests.count < 0)+ onedev.server.ajaxRequests.count = 0;});}},diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 5f990cbbbd..40ef5f46e6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -40,6 +40,7 @@<div wicket:id="title" class="topbar-title"></div></div><div class="topbar-right text-nowrap">+ <a wicket:id="alerts" class="text-warning topbar-link"><wicket:svg href="exclamation-circle-o" class="icon"></wicket:svg></a><a wicket:id="showCommandPalette" class="topbar-link command-palette"></a><a wicket:id="darkMode" class="topbar-link" title="Toggle dark mode"><svg wicket:id="icon" class="icon"/></a><a href="https://github.com/theonedev/onedev" class="github topbar-link d-none d-sm-inline" target="_blank">@@ -123,4 +124,12 @@<div wicket:id="subMenu" class="menu-body"></div></div></wicket:fragment>+ <wicket:fragment wicket:id="alertsFrag">+ <div class="alerts p-3">+ <table wicket:id="alerts" class="table table-hover"></table>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="alertActionFrag">+ <a wicket:id="delete" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ </wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 335ca19aae..55254d8580 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -1,15 +1,23 @@package io.onedev.server.web.page.layout;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.Plugin;import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.entitymanager.AlertManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Alert;import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.brandlogo.BrandLogoPanel;import io.onedev.server.web.component.commandpalette.CommandPalettePanel;+import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -32,9 +40,9 @@ import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.groupmanagement.GroupListPage;import io.onedev.server.web.page.admin.groupmanagement.GroupPage;import io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;+import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;-import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;@@ -76,7 +84,13 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -90,15 +104,20 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.Order;import javax.servlet.http.Cookie;import java.util.*;+import static io.onedev.server.model.Alert.PROP_DATE;+@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {@@ -395,6 +414,109 @@ public abstract class LayoutPage extends BasePage {topbar.add(newTopbarTitle("title"));+ DropdownLink alertsLink;+ topbar.add(alertsLink = new DropdownLink("alerts") {++ private AlertManager getAlertManager() {+ return OneDev.getInstance(AlertManager.class);+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment alertsFrag = new Fragment(id, "alertsFrag", LayoutPage.this);+ List<IColumn<Alert, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<>(Model.of("Date")) {++ @Override+ public void populateItem(Item<ICellPopulator<Alert>> cellItem, String componentId, IModel<Alert> rowModel) {+ cellItem.add(new Label(componentId, DateUtils.formatDateTime(rowModel.getObject().getDate())));+ }+ });+ columns.add(new AbstractColumn<>(Model.of("Message")) {++ @Override+ public void populateItem(Item<ICellPopulator<Alert>> cellItem, String componentId, IModel<Alert> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getMessage()));+ }+ });+ columns.add(new AbstractColumn<>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<Alert>> cellItem, String componentId, IModel<Alert> rowModel) {+ Fragment actionFrag = new Fragment(componentId, "alertActionFrag", LayoutPage.this);+ actionFrag.add(new AjaxLink<Void>("delete") {+ @Override+ public void onClick(AjaxRequestTarget target) {+ getAlertManager().delete(rowModel.getObject());+ notifyObservableChange(target, Alert.getChangeObservable());+ }+ });+ cellItem.add(actionFrag);+ }+ });++ SortableDataProvider<Alert, Void> dataProvider = new SortableDataProvider<Alert, Void>() {++ @Override+ public Iterator<? extends Alert> iterator(long first, long count) {+ var criteria = EntityCriteria.of(Alert.class);+ criteria.addOrder(Order.desc(PROP_DATE));+ return getAlertManager().query(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return getAlertManager().count();+ }++ @Override+ public IModel<Alert> model(Alert object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Alert>() {++ @Override+ protected Alert load() {+ return getAlertManager().load(id);+ }++ };+ }+ };++ alertsFrag.add(new DefaultDataTable<>("alerts", columns, dataProvider,+ WebConstants.PAGE_SIZE, null));+ alertsFrag.add(new ChangeObserver() {+ @Override+ protected Collection<String> findObservables() {+ return Sets.newHashSet(Alert.getChangeObservable());+ }+ });+ alertsFrag.setOutputMarkupId(true);+ return alertsFrag;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator() && getAlertManager().count(false) != 0);+ }++ });+ alertsLink.setOutputMarkupPlaceholderTag(true);++ topbar.add(new ChangeObserver() {+ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(alertsLink);+ }++ @Override+ protected Collection<String> findObservables() {+ return Sets.newHashSet(Alert.getChangeObservable());+ }+ });+topbar.add(new ModalLink("showCommandPalette") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.jsindex d7e8c178a7..d1f7dc1068 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js@@ -135,8 +135,9 @@ onedev.server.layout = {return false;});- if (onedev.server.util.isMac())+ if (onedev.server.util.isMac()) {$("a.command-palette").attr("title", "cmd-k to show command palette").html("<span class='keycap'>⌘</span> <span class='keycap'>k</span>");+ }else$("a.command-palette").attr("title", "ctrl-k to show command palette").html("<span class='keycap'>ctrl</span> <span class='keycap'>k</span>");$(document).keydown(function(e) {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.javanew file mode 100644index 0000000000..daa5af819f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/websocket/AlertEventBroadcaster.java@@ -0,0 +1,34 @@+package io.onedev.server.web.websocket;++import com.google.common.collect.Sets;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.model.Alert;++import javax.inject.Inject;+import javax.inject.Singleton;++@Singleton+public class AlertEventBroadcaster {++ private final WebSocketManager webSocketManager;++ @Inject+ public AlertEventBroadcaster(WebSocketManager webSocketManager) {+ this.webSocketManager = webSocketManager;+ }++ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof Alert)+ webSocketManager.notifyObservablesChange(Sets.newHashSet(Alert.getChangeObservable()), event.getSourcePage());+ }++ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Alert)+ webSocketManager.notifyObservablesChange(Sets.newHashSet(Alert.getChangeObservable()), event.getSourcePage());+ }++}\ No newline at end of file