2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix date header (remove thread stuff)

Browse source
This commit is contained in:
Laura Klünder 2017-12-23 20:12:38 +01:00
parent 30c7d29e9f
commit 4a302f46f9
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/c3nav/tileserver/wsgi.py
View file

@ -60,9 +60,6 @@ class TileServer:
self.cache_package_etag = None self.cache_package_etag = None
self.cache_package_filename = None self.cache_package_filename = None
self.date_header = ('Date', '0')
threading.Thread(target=self.date_thread, daemon=True).start()
self.cache = pylibmc.Client(["127.0.0.1"], binary=True, behaviors={"tcp_nodelay": True, "ketama": True}) self.cache = pylibmc.Client(["127.0.0.1"], binary=True, behaviors={"tcp_nodelay": True, "ketama": True})
wait = 1 wait = 1
@ -82,12 +79,8 @@ class TileServer:
time.sleep(self.reload_interval) time.sleep(self.reload_interval)
self.load_cache_package() self.load_cache_package()
def date_thread(self): def get_date_header(self):
# why do we do this in a thread? because it makes us able to handle 2000 requests per second more return 'Date', formatdate(timeval=time.time(), localtime=False, usegmt=True)
while True:
now = time.time()
self.date_header = 'Date', formatdate(timeval=time.time(), localtime=False, usegmt=True)
time.sleep(1-(now-int(now)))
def load_cache_package(self): def load_cache_package(self):
logger.debug('Downloading cache package from upstream...') logger.debug('Downloading cache package from upstream...')
@ -136,13 +129,13 @@ class TileServer:
return True return True
def not_found(self, start_response, text): def not_found(self, start_response, text):
start_response('404 Not Found', [self.date_header, start_response('404 Not Found', [self.get_date_header(),
('Content-Type', 'text/plain'), ('Content-Type', 'text/plain'),
('Content-Length', str(len(text)))]) ('Content-Length', str(len(text)))])
return [text] return [text]
def deliver_tile(self, start_response, etag, data): def deliver_tile(self, start_response, etag, data):
start_response('200 OK', [self.date_header, start_response('200 OK', [self.get_date_header(),
('Content-Type', 'image/png'), ('Content-Type', 'image/png'),
('Content-Length', str(len(data))), ('Content-Length', str(len(data))),
('Cache-Control', 'no-cache'), ('Cache-Control', 'no-cache'),
@ -207,7 +200,7 @@ class TileServer:
if_none_match = env.get('HTTP_IF_NONE_MATCH') if_none_match = env.get('HTTP_IF_NONE_MATCH')
tile_etag = build_tile_etag(level, zoom, x, y, base_cache_key, access_cache_key, self.tile_secret) tile_etag = build_tile_etag(level, zoom, x, y, base_cache_key, access_cache_key, self.tile_secret)
if if_none_match == tile_etag: if if_none_match == tile_etag:
start_response('304 Not Modified', [self.date_header, start_response('304 Not Modified', [self.get_date_header(),
('Content-Length', '0'), ('Content-Length', '0'),
('ETag', tile_etag)]) ('ETag', tile_etag)])
return [b''] return [b'']
@ -225,7 +218,7 @@ class TileServer:
return self.deliver_tile(start_response, tile_etag, r.content) return self.deliver_tile(start_response, tile_etag, r.content)
start_response('%d %s' % (r.status_code, r.reason), [ start_response('%d %s' % (r.status_code, r.reason), [
self.date_header, self.get_date_header(),
('Content-Length', len(r.content)), ('Content-Length', len(r.content)),
('Content-Type', r.headers.get('Content-Type', 'text/plain')) ('Content-Type', r.headers.get('Content-Type', 'text/plain'))
]) ])