Merge pull request #248 from ArtrenH/main

2023-11-27
vplan-fr · Nov 27, 2023 · dd55d0b · dd55d0b
2 parents 6c76c5b + a9a6ef4
commit dd55d0b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/backend/load_plans.py b/backend/load_plans.py
@@ -133,6 +133,8 @@ async def main():
     argument_parser.add_argument("--never-raise-out-of-proxies", action="store_true",
                                  help="Never crash the program if no more proxies seem to be available. "
                                       "Keep trying instead.")
+    argument_parser.add_argument("-interval", "-i", type=int, default=60,
+                                 help="Interval in seconds between each download cycle.")
     argument_parser.add_argument("-loglevel", "-l", default="INFO")
 
     args = argument_parser.parse_args()
@@ -164,12 +166,14 @@ async def main():
                 )
             else:
                 await asyncio.gather(
-                    *[crawler.plan_downloader.check_infinite(ignore_exceptions=args.ignore_exceptions)
+                    *[crawler.plan_downloader.check_infinite(ignore_exceptions=args.ignore_exceptions,
+                                                             interval=args.interval)
                       for crawler in crawlers.values()]
                 )
         else:
             await asyncio.gather(
-                *[crawler.check_infinite(once=args.once, ignore_exceptions=args.ignore_exceptions)
+                *[crawler.check_infinite(once=args.once, ignore_exceptions=args.ignore_exceptions,
+                                         interval=args.interval)
                   for crawler in crawlers.values()]
             )
     finally:

diff --git a/shared/comm.py b/shared/comm.py
@@ -94,12 +94,18 @@ async def send_message_async(message: Message) -> Message | None:
 
                 data = _serialize(message)
 
-                url = urllib3.util.Url(scheme="http", host="localhost", port=str(_PORT))
+                url = urllib3.util.Url(scheme="http", host="localhost", port=_PORT)
 
                 async with session.post(str(url), data=data, timeout=5) as response:
                     return _deserialize(await response.content.read())
+        except aiohttp.ClientConnectorError as e:
+            if e.errno == 111:
+                logging.getLogger("comm").warning(f"Error while sending message. Error: {str(e)}")
+                return None
+            else:
+                raise
         except Exception as e:
-            logging.getLogger("comm").exception("Error while sending message.", exc_info=e)
+            logging.getLogger("comm").error("Error while sending message.", exc_info=e)
             return None