eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qingwz...@apache.org
Subject eagle git commit: [EAGLE-1056] fix a link bug in the email template
Date Tue, 27 Jun 2017 04:32:31 GMT
Repository: eagle
Updated Branches:
  refs/heads/branch-0.5 d6d859fbd -> 9a844290b


[EAGLE-1056] fix a link bug in the email template

https://issues.apache.org/jira/browse/EAGLE-1056

Author: Zhao, Qingwen <qingwzhao@apache.org>

Closes #960 from qingwen220/EAGLE-1056.

(cherry picked from commit aa136afa9e99381835356f647daccbf6b7a8be9f)
Signed-off-by: Zhao, Qingwen <qingwzhao@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/9a844290
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/9a844290
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/9a844290

Branch: refs/heads/branch-0.5
Commit: 9a844290b67db50f7d7924147e322b47c60a8a61
Parents: d6d859f
Author: Zhao, Qingwen <qingwzhao@apache.org>
Authored: Tue Jun 27 12:31:38 2017 +0800
Committer: Zhao, Qingwen <qingwzhao@apache.org>
Committed: Tue Jun 27 12:32:25 2017 +0800

----------------------------------------------------------------------
 .../alert/engine/publisher/email/AlertEmailGenerator.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/eagle/blob/9a844290/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/email/AlertEmailGenerator.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/email/AlertEmailGenerator.java
b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/email/AlertEmailGenerator.java
index a57941e..e237f43 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/email/AlertEmailGenerator.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/email/AlertEmailGenerator.java
@@ -150,15 +150,15 @@ public class AlertEmailGenerator {
             : String.format("http://%s:%s", this.getServerHost(), this.getServerPort());
         try {
             alertContext.put(PublishConstants.ALERT_EMAIL_ALERT_DETAIL_URL,
-                String.format("%s/#/site/%s/alert/detail/%s", rootUrl, event.getSiteId(),
URIUtil.encodeQuery(event.getAlertId(), "UTF-8")));
+                String.format("%s/#/site/%s/alert/detail/%s?timestamp=%s", rootUrl, event.getSiteId(),
URIUtil.encodeQuery(event.getAlertId(), "UTF-8"), event.getTimestamp()));
             alertContext.put(PublishConstants.ALERT_EMAIL_POLICY_DETAIL_URL,
                 String.format("%s/#/site/%s/policy/detail/%s", rootUrl, event.getSiteId(),
URIUtil.encodeQuery(event.getPolicyId(), "UTF-8")));
         } catch (URIException e) {
             LOG.warn(e.getMessage(), e);
             alertContext.put(PublishConstants.ALERT_EMAIL_ALERT_DETAIL_URL,
-                String.format("%s/#/site/%s/alert/detail/%s?timestamp=%s", event.getSiteId(),
rootUrl, event.getAlertId(), event.getTimestamp()));
+                String.format("%s/#/site/%s/alert/detail/%s?timestamp=%s", rootUrl, event.getSiteId(),
event.getAlertId(), event.getTimestamp()));
             alertContext.put(PublishConstants.ALERT_EMAIL_POLICY_DETAIL_URL,
-                String.format("%s/#/site/%s/policy/detail/%s", event.getSiteId(), rootUrl,
event.getPolicyId()));
+                String.format("%s/#/site/%s/policy/detail/%s", rootUrl, event.getSiteId(),
event.getPolicyId()));
         }
         alertContext.put(PublishConstants.ALERT_EMAIL_HOME_URL, rootUrl);
         return alertContext;


Mime
View raw message