public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correcting url in widget on standalones.

Browse source
This commit is contained in:
Samuel Clay 2022-02-02 16:02:40 -05:00
parent 99c4faaa79
commit 8c58e3aaad
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/reader/views.py
View file

@ -1609,6 +1609,7 @@ def load_river_stories_widget(request):
start = time.time()
def load_url(url):
original_url = url
url = urllib.parse.urljoin(settings.NEWSBLUR_URL, url)
scontext = ssl.SSLContext(ssl.PROTOCOL_TLS)
scontext.verify_mode = ssl.VerifyMode.CERT_NONE
@ -1617,12 +1618,15 @@ def load_river_stories_widget(request):
except urllib.request.URLError:
url = url.replace('localhost', 'haproxy')
conn = urllib.request.urlopen(url, context=scontext, timeout=timeout)
except urllib.request.URLError as e:
logging.user(request.user, '"%s" not fetched in %ss: %s' % (url, (time.time() - start), e))
return None
except socket.timeout:
logging.user(request.user, '"%s" not fetched in %ss' % (url, (time.time() - start)))
return None
data = conn.read()
logging.user(request.user, '"%s" fetched in %ss' % (url, (time.time() - start)))
return dict(url=url, data=data)
return dict(url=original_url, data=data)
# Find the image thumbnails and download in parallel
thumbnail_urls = []