diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 17:26:36 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 17:26:36 +0000 |
| commit | db9ce032a4223f44ff0d823f36515cefbb534bf5 (patch) | |
| tree | 95dfbfaac7947c2c7d575c8e6a825dadf8d0d4c9 /synapse/http | |
| parent | Use module loggers rather than the root logger. Exceptions caused by bad clie... (diff) | |
| download | synapse-db9ce032a4223f44ff0d823f36515cefbb534bf5.tar.xz | |
Fix pep8 codestyle warnings
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/content_repository.py | 14 | ||||
| -rw-r--r-- | synapse/http/server.py | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/synapse/http/content_repository.py b/synapse/http/content_repository.py index 1306b35271..7e046dfe49 100644 --- a/synapse/http/content_repository.py +++ b/synapse/http/content_repository.py @@ -131,12 +131,14 @@ class ContentRepoResource(resource.Resource): request.setHeader('Content-Type', content_type) # cache for at least a day. - # XXX: we might want to turn this off for data we don't want to recommend - # caching as it's sensitive or private - or at least select private. - # don't bother setting Expires as all our matrix clients are smart enough to - # be happy with Cache-Control (right?) - request.setHeader('Cache-Control', 'public,max-age=86400,s-maxage=86400') - + # XXX: we might want to turn this off for data we don't want to + # recommend caching as it's sensitive or private - or at least + # select private. don't bother setting Expires as all our matrix + # clients are smart enough to be happy with Cache-Control (right?) + request.setHeader( + "Cache-Control", "public,max-age=86400,s-maxage=86400" + ) + d = FileSender().beginFileTransfer(f, request) # after the file has been sent, clean up and finish the request diff --git a/synapse/http/server.py b/synapse/http/server.py index 03f7768761..8024ff5bde 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -138,8 +138,7 @@ class JsonResource(HttpServer, resource.Resource): ) except CodeMessageException as e: if isinstance(e, SynapseError): - logger.info("%s SynapseError: %s - %s", request, e.code, - e.msg) + logger.info("%s SynapseError: %s - %s", request, e.code, e.msg) else: logger.exception(e) self._send_response( |