bad uptime

Author: DevAlone

models.py

@@ -32,6 +32,7 @@ class Proxy(Base):
     checking_period = Column(Integer, default=settings.MIN_PROXY_CHECKING_PERIOD, nullable=False)
     number_of_bad_checks = Column(Integer, default=0)
     uptime = Column(Integer, nullable=True, default=None)
+    bad_uptime = Column(Integer, nullable=True, default=None)
     # in microseconds
     response_time = Column(Integer, nullable=True, default=None)
 

processor.py

@@ -240,6 +240,8 @@ async def process_proxy(self, raw_protocol: int, auth_data: str, domain: str, po
                 if proxy:
                     proxy.number_of_bad_checks += 1
                     proxy.uptime = int(time.time())
+                    if proxy.number_of_bad_checks > settings.DEAD_PROXY_THRESHOLD:
+                        proxy.bad_uptime = int(time.time())
 
                     if proxy.number_of_bad_checks > settings.REMOVE_ON_N_BAD_CHECKS:
                         self.logger.debug('removing proxy {0} permanently...'.format(proxy.to_url()))
@@ -283,13 +285,17 @@ def create_or_update_proxy(raw_protocol: Proxy.PROTOCOLS, auth_data, domain, por
             proxy = Proxy(raw_protocol=raw_protocol, auth_data=auth_data, domain=domain, port=port)
             session.add(proxy)
 
+        if proxy.bad_proxy or proxy.uptime is None or proxy.uptime == 0:
+            proxy.uptime = int(time.time())
+
+        if proxy.bad_uptime is None or proxy.bad_uptime == 0 or \
+                proxy.number_of_bad_checks > settings.DEAD_PROXY_THRESHOLD:
+            proxy.bad_uptime = int(time.time())
+
         proxy.response_time = response_time
         proxy.number_of_bad_checks = 0
         proxy.last_check_time = int(time.time())
 
-        if proxy.bad_proxy or proxy.uptime is None or proxy.uptime == 0:
-            proxy.uptime = int(time.time())
-
         checking_time = int(end_checking_time - start_checking_time)
         if checking_time > settings.PROXY_CHECKING_TIMEOUT:
             checking_time = settings.PROXY_CHECKING_TIMEOUT

server/proxy_provider_server.py

@@ -137,6 +137,7 @@ async def get_proxies_html(self, request):
                 "address": proxy.address,
                 "response_time": proxy.response_time / 1000 if proxy.response_time is not None else None,
                 "uptime": datetime.timedelta(seconds=int(current_timestamp - proxy.uptime)),
+                "bad_uptime": datetime.timedelta(seconds=int(current_timestamp - proxy.bad_uptime)),
                 "last_check_time": proxy.last_check_time,
                 "checking_period": proxy.checking_period,
                 "number_of_bad_checks": proxy.number_of_bad_checks,

server/templates/proxies.html

@@ -6,6 +6,7 @@
             <td>address</td>
             <td>response_time</td>
             <td>uptime</td>
+            <td>bad_uptime</td>
             <td>last_check_time</td>
             <td>checking_period</td>
             <td>number_of_bad_checks</td>
@@ -19,6 +20,7 @@
             <td>{{ proxy.address }}</td>
             <td>{{ proxy.response_time }} ms</td>
             <td>{{ proxy.uptime }}</td>
+            <td>{{ proxy.bad_uptime }}</td>
             <td id="proxy_{{ loop.index }}_last_check_time">{{ proxy.last_check_time }}</td>
             <td>{{ proxy.checking_period }}</td>
             <td>{{ proxy.number_of_bad_checks }}</td>