[incubator-skywalking] branch master updated: Alarm silence init wrong. (#1752)

[pengys]

This is an automated email from the ASF dual-hosted git repository.

pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f8af95  Alarm silence init wrong. (#1752)
3f8af95 is described below

commit 3f8af95df0a4312f6e903fb11146a4bb7097327d
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Thu Oct 11 10:38:52 2018 +0800

    Alarm silence init wrong. (#1752)
---
 .../apache/skywalking/oap/server/core/alarm/provider/RulesReader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
 
b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
index 897d892..3a511ad 100644
--- 
a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
+++ 
b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
@@ -63,7 +63,7 @@ public class RulesReader {
                         alarmRule.setOp((String)settings.get("op"));
                         
alarmRule.setPeriod((Integer)settings.getOrDefault("period", 1));
                         
alarmRule.setCount((Integer)settings.getOrDefault("count", 1));
-                        
alarmRule.setSilencePeriod((Integer)settings.getOrDefault("silence-period", 
alarmRule.getPeriod()));
+                        
alarmRule.setSilencePeriod((Integer)settings.getOrDefault("silence-period", 
-1));
                         
alarmRule.setMessage((String)settings.getOrDefault("message", "Alarm caused by 
Rule " + alarmRule.getAlarmRuleName()));
 
                         rules.getRules().add(alarmRule);