X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fhttp.py;h=949b306f1f651c8ac3429d0de3dbaa0ba9658861;hb=f1ed2e8232b4ecabbfe65aa6ab2d28567989e104;hp=d253568419b56d82b7033494aa1560a4982bff7b;hpb=cfe6dafed6e43714316c39c401475ed840e66a02;p=mpd-sima.git diff --git a/sima/lib/http.py b/sima/lib/http.py index d253568..949b306 100644 --- a/sima/lib/http.py +++ b/sima/lib/http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014-2015 Jack Kaliko +# Copyright (c) 2014-2015, 2020 kaliko # Copyright (c) 2012, 2013 Eric Larson # # This program is free software: you can redistribute it and/or modify @@ -232,7 +232,7 @@ class CacheController(object): self.cache.set(cache_url, resp) # Force one month max age if no Cache-Control header is found # Overriding header disappearance on LastFM web service... - # https://getsatisfaction.com/lastfm/topics/-web-api-http-cache-control-header + # https://gitlab.com/kaliko/sima/-/issues/7 elif CacheController.CACHE_ANYWAY: resp.headers['Cache-Control'] = 'max-age=2419200' self.cache.set(cache_url, resp) @@ -280,6 +280,7 @@ class HttpClient: """ self.stats = stats self.controller = CacheController(cache) + self.sess = Session() def __call__(self, ress, payload): req = Request('GET', ress, params=payload,).prepare() @@ -301,9 +302,8 @@ class HttpClient: @Throttle(WAIT_BETWEEN_REQUESTS) def fetch_ws(self, prepreq): """fetch from web service""" - sess = Session() - settings = sess.merge_environment_settings(prepreq.url, {}, None, False, None) - resp = sess.send(prepreq, timeout=SOCKET_TIMEOUT, **settings) + settings = self.sess.merge_environment_settings(prepreq.url, {}, None, False, None) + resp = self.sess.send(prepreq, timeout=SOCKET_TIMEOUT, **settings) if resp.status_code == 304: self.stats.update(etag=self.stats.get('etag')+1) resp = self.controller.update_cached_response(prepreq, resp)