Commit 7bd92f60 authored by ascrutae's avatar ascrutae
Browse files

fix #82

parent f50eab92

skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java

+4 −4
Original line number Diff line number Diff line
@@ -138,16 +138,16 @@ public class AlarmMessageProcessor { 
        String title = (exceptionAlarmSize > 0 ? "[Error]" : "[Warning]")

                + " Dear  "

                + userName

                + ", SkyWalking collects "

                + ", Skywalking has collected  "

                + (exceptionAlarmSize > 0 ? exceptionAlarmSize

                + " tid of system exceptions, " : "");

                + "  system exception message(s)   " : "");

        if (count > exceptionAlarmSize) {

            title += (count - exceptionAlarmSize) + " tid of warnings, ";

            title += exceptionAlarmSize > 0 ? "and " : ""  + (count - exceptionAlarmSize) + " system warning message(s) ";

        }

        title += "between "

                + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(

                startTime * 10000 * 6))

                + " to "

                + " and "

                + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(

                endTime * 10000 * 6));

skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/MailSender.java

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ public class MailSender { 


            config.setProperty("mail.transport.protocol", Config.MailSenderInfo.TRANSPORT_PROTOCOL);

            config.setProperty("mail.smtp.auth", String.valueOf(Config.MailSenderInfo.SMTP_AUTH));

            config.setProperty("mail.smtp.socketFactory.port", "587");

            config.setProperty("mail.debug", "true");

            //config.setProperty("mail.smtp.ssl.enable", "true");

            if (Config.MailSenderInfo.SSL_ENABLE) {

                MailSSLSocketFactory sf = new MailSSLSocketFactory();

                sf.setTrustAllHosts(true);

skywalking-alarm/src/main/resources/mail-template.ftl

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 


<div id="mainDiv">

    <p class="greetings">Dear ${name!}:</p>

    <p class="greetings">&nbsp&nbsp&nbsp&nbspOur platform collects alarm infomation between <b>${startDate!} </b>to<b> ${endDate!}</b> as follows:

    <p class="greetings">&nbsp&nbsp&nbsp&nbspHere are the alarm message(s) between <b>${startDate!} </b> and <b> ${endDate!}</b> :

    </p>

    <table id="dataTable" width="80%">

        <tr id="dataTableHead">

skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ public class AlarmMessageSender { 
        Jedis jedis = null;

        try {

            jedis = AlarmRedisConnector.getJedis();

            if (jedis != null)

            if (jedis == null)

                return;

            jedis.hsetnx(alarmKey, traceId, message);

            jedis.expire(alarmKey, Config.Alarm.ALARM_EXPIRE_SECONDS);

skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmRedisConnector.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ public class AlarmRedisConnector { 
    }



    public static Jedis getJedis() {

        if (Config.Alarm.ALARM_OFF_FLAG) {

        if (!Config.Alarm.ALARM_OFF_FLAG) {

            return null;

        } else {

            return jedisPool.getResource();