Merge pull request #4 from jianxiaoguo/master

chore(monitor): BlackMappingAdder when reponse code 50X

Author: duanhongyi

smartdns/monitor.py

@@ -31,7 +31,7 @@ def _check(self):
             url = self.monitor['url'].replace(host, ip, 1).encode("utf8")
             agent = Agent(reactor, contextFactory=SmartClientContextFactory(), connectTimeout=30)
             agent.request(b'GET', url, headers=Headers({"host": [host, ]})).addCallbacks(
-                BlackMappingRemover(ip, self.black_mapping), BlackMappingAdder(ip, self.black_mapping))
+                BlackMappingChecker(ip, self.black_mapping), BlackMappingAdder(ip, self.black_mapping))
 
     def check(self, ip):
         return self.black_mapping[ip] < self.monitor["frequency"]
@@ -40,24 +40,23 @@ def start(self):
         task.LoopingCall(self._check).start(self.monitor["interval"])
 
 
-class BlackMappingRemover(object):
+class BlackMappingAdder(object):
 
     def __init__(self, ip, black_mapping):
         self.ip = ip
         self.black_mapping = black_mapping
 
     def __call__(self, *args, **kwargs):
-        self.black_mapping[self.ip] = 0
+        self.black_mapping[self.ip] += 1
 
 
-class BlackMappingAdder(object):
+class BlackMappingChecker(BlackMappingAdder):
 
-    def __init__(self, ip, black_mapping):
-        self.ip = ip
-        self.black_mapping = black_mapping
-
-    def __call__(self, *args, **kwargs):
-        self.black_mapping[self.ip] += 1
+    def __call__(self, response, *args, **kwargs):
+        if response.code < 500:
+            self.black_mapping[self.ip] = 0
+        else:
+            BlackMappingAdder.__call__(self, *args, **kwargs)
 
 
 class MonitorMapping(object):