# HG changeset patch # User Goffi # Date 1517295681 -3600 # Node ID c2037b44f84e7ec1f1ac80f2055a6a650105df0b # Parent f2170536ba232dcd6caa6718e6379f50b01c1106 server: fixed cache_dir for service profile in session interface diff -r f2170536ba23 -r c2037b44f84e src/server/server.py --- a/src/server/server.py Fri Jan 26 11:15:26 2018 +0100 +++ b/src/server/server.py Tue Jan 30 08:01:21 2018 +0100 @@ -2026,7 +2026,8 @@ service_path = regex.pathEscape(C.SERVICE_PROFILE) cache_dir = os.path.join(self.cache_root_dir, service_path) self.cache_resource.putChild(service_path, ProtectedFile(cache_dir)) - self.service_cache_url = os.path.join(C.CACHE_DIR, service_path) + self.service_cache_url = u'/' + os.path.join(C.CACHE_DIR, service_path) + session_iface.SATSession.service_cache_url = self.service_cache_url if self.options['connection_type'] in ('https', 'both'): self._TLSOptionsCheck() diff -r f2170536ba23 -r c2037b44f84e src/server/session_iface.py --- a/src/server/session_iface.py Fri Jan 26 11:15:26 2018 +0100 +++ b/src/server/session_iface.py Tue Jan 30 08:01:21 2018 +0100 @@ -44,6 +44,8 @@ @property def cache_dir(self): + if self.profile is None: + return self.service_cache_url + u'/' return os.path.join(u'/', C.CACHE_DIR, self.uuid) + u'/' def getPageData(self, page, key):