some fixes

Author: DevAlone

.gitignore

@@ -9,3 +9,4 @@ migrations
 alembic.ini
 alembic
 env/
+local_checkers/

checkers/base_checker.py

@@ -51,39 +51,43 @@ async def check(self, proxy_address: str, timeout: int=None) -> tuple:
         and second one is additional information structure with information like white ip address, country and so on
         """
 
+        timeout = timeout if timeout is not None else self.timeout
+
+        try:
+            return await self._request(proxy_address, timeout)
+        except (aiohttp.client_exceptions.ServerDisconnectedError,
+                aiohttp.client_exceptions.ClientHttpProxyError,
+                aiohttp.client_exceptions.ClientProxyConnectionError,
+                aiohttp.client_exceptions.ClientResponseError,
+                aiosocks.errors.SocksError,
+                aiosocks.SocksError,
+                asyncio.TimeoutError,
+                aiohttp.client_exceptions.ClientOSError,
+                ssl.CertificateError,
+                ) as ex:
+            message = str(ex)
+            if "file" in message:
+                print(message)
+            # TODO: check for "Too many open files"
+
+        return False, None
+
+    async def _request(self, proxy_address, timeout) -> tuple:
         checker_result = CheckerResult()
+
         if self.url is None:
             raise Exception()
 
         headers = {
             'User-Agent': async_requests.get_random_user_agent()
         }
-
         conn = ProxyConnector(remote_resolve=True)
 
-        timeout = timeout if timeout is not None else self.timeout
-
         with aiohttp.ClientSession(connector=conn, request_class=ProxyClientRequest) as session:
-            try:
-                async with session.request(
-                            self.request_type, self.url, proxy=proxy_address, timeout=timeout, headers=headers) as \
-                        response:
-                    is_working = await self._check(response, checker_result)
-            except (aiohttp.client_exceptions.ServerDisconnectedError,
-                    aiohttp.client_exceptions.ClientHttpProxyError,
-                    aiohttp.client_exceptions.ClientProxyConnectionError,
-                    aiohttp.client_exceptions.ClientResponseError,
-                    aiosocks.errors.SocksError,
-                    aiosocks.SocksError,
-                    asyncio.TimeoutError,
-                    aiohttp.client_exceptions.ClientOSError,
-                    ssl.CertificateError,
-                    ) as ex:
-                is_working = False
-                message = str(ex)
-                if "file" in message:
-                    print(message)
-                # TODO: check for "Too many open files"
+            async with session.request(
+                    self.request_type, self.url, proxy=proxy_address, timeout=timeout, headers=headers) as \
+                    response:
+                is_working = await self._check(response, checker_result)
 
         return is_working, checker_result
 

processor.py

@@ -301,17 +301,18 @@ def create_or_update_proxy(raw_protocol: Proxy.PROTOCOLS, auth_data, domain, por
         proxy.number_of_bad_checks = 0
         proxy.last_check_time = int(time.time())
 
-        if additional_info.ipv4 is not None:
-            proxy.white_ipv4 = additional_info.ipv4
+        if additional_info is not None:
+            if additional_info.ipv4 is not None:
+                proxy.white_ipv4 = additional_info.ipv4
 
-        if additional_info.city is not None:
-            proxy.city = additional_info.city
+            if additional_info.city is not None:
+                proxy.city = additional_info.city
 
-        if additional_info.region is not None:
-            proxy.region = additional_info.region
+            if additional_info.region is not None:
+                proxy.region = additional_info.region
 
-        if additional_info.country_code is not None:
-            proxy.country_code = additional_info.country_code.strip().lower()
+            if additional_info.country_code is not None:
+                proxy.country_code = additional_info.country_code.strip().lower()
 
         checking_time = int(end_checking_time - start_checking_time)
         if checking_time > settings.PROXY_CHECKING_TIMEOUT: