stability tweaks

This commit is contained in:
simon987 2020-12-25 20:12:15 -05:00
parent 95017c646e
commit 19636abafe
3 changed files with 11 additions and 2 deletions

View File

@ -7,3 +7,4 @@ services:
environment: environment:
- "PF_REDIS_HOST=" - "PF_REDIS_HOST="
- "PF_RPS=1" - "PF_RPS=1"
- "PF_MAX_PAGE=300"

View File

@ -1,4 +1,5 @@
import json import json
import os
from json import JSONDecodeError from json import JSONDecodeError
from urllib.parse import urljoin from urllib.parse import urljoin
@ -6,6 +7,8 @@ from post_process import get_links_from_body
from state import PoalState from state import PoalState
from util import Web, logger from util import Web, logger
PF_MAX_PAGE = os.environ.get("PF_MAX_PAGE", 9999999)
class PoalHelper: class PoalHelper:
@ -74,6 +77,8 @@ class PoalHelper:
page = 1 page = 1
else: else:
page = int(r.url.split("/")[-1]) page = int(r.url.split("/")[-1])
if page + 1 > PF_MAX_PAGE:
return posts, None
return posts, self.posts_url(board, page=page + 1) return posts, self.posts_url(board, page=page + 1)
return posts, None return posts, None

View File

@ -28,12 +28,15 @@ class Web:
kwargs["headers"]["User-Agent"] = UA kwargs["headers"]["User-Agent"] = UA
else: else:
kwargs["headers"] = {"User-Agent": UA} kwargs["headers"] = {"User-Agent": UA}
retries = 3 retries = 8
while retries > 0: while retries > 0:
retries -= 1 retries -= 1
try: try:
return self.session.get(url, **kwargs) r = self.session.get(url, **kwargs)
if r.status_code == 500:
raise Exception("Server error")
return r
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e: