indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Cache favicons in memory

merge-requests/30/head
Bob Mottram 2021-12-16 22:39:05 +00:00
parent e9b98b82ce
commit 3a488db6d1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -7411,7 +7411,20 @@ class PubServer(BaseHTTPRequestHandler):
baseDir: str, GETstartTime) -> None: baseDir: str, GETstartTime) -> None:
"""Shows a favicon image obtained from the cache """Shows a favicon image obtained from the cache
""" """
favFile = path.replace('/favicons/', '')
mediaFilename = baseDir + urllib.parse.unquote_plus(path) mediaFilename = baseDir + urllib.parse.unquote_plus(path)
if self.server.faviconsCache.get(favFile):
mediaBinary = self.server.faviconsCache[favFile]
self._set_headers_etag(mediaFilename,
'image/x-icon',
mediaBinary, None,
refererDomain,
False, None)
self._write(mediaBinary)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_showCachedFavicon2',
self.server.debug)
return
if not os.path.isfile(mediaFilename): if not os.path.isfile(mediaFilename):
self._404() self._404()
return return
@ -7426,9 +7439,8 @@ class PubServer(BaseHTTPRequestHandler):
except OSError: except OSError:
print('EX: unable to read cached favicon ' + mediaFilename) print('EX: unable to read cached favicon ' + mediaFilename)
if mediaBinary: if mediaBinary:
mimeType = mediaFileMimeType(mediaFilename)
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mimeType, 'image/x-icon',
mediaBinary, None, mediaBinary, None,
refererDomain, refererDomain,
False, None) False, None)
@ -7436,6 +7448,7 @@ class PubServer(BaseHTTPRequestHandler):
fitnessPerformance(GETstartTime, self.server.fitness, fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_showCachedFavicon', '_GET', '_showCachedFavicon',
self.server.debug) self.server.debug)
self.server.faviconsCache[favFile] = mediaBinary
return return
self._404() self._404()
@ -18664,6 +18677,7 @@ def runDaemon(contentLicenseUrl: str,
httpd.instanceId = instanceId httpd.instanceId = instanceId
httpd.personCache = {} httpd.personCache = {}
httpd.cachedWebfingers = {} httpd.cachedWebfingers = {}
httpd.faviconsCache = {}
httpd.proxyType = proxyType httpd.proxyType = proxyType
httpd.session = None httpd.session = None
httpd.sessionLastUpdate = 0 httpd.sessionLastUpdate = 0