summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-08-25 16:00:31 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-08-25 16:00:31 +0100
commitadf53f04cea7eb9629896769aa8ca642a0a4646e (patch)
tree66fd56f4262c32d4e642c13065badbaa9fd3a637 /synapse/appservice
parentDon't need toplevel cache on 3PE lookup metadata any more (diff)
downloadsynapse-adf53f04cea7eb9629896769aa8ca642a0a4646e.tar.xz
appease pep8
Diffstat (limited to 'synapse/appservice')
-rw-r--r--synapse/appservice/api.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 9de5c6e47a..d28a9dff0a 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -60,7 +60,7 @@ class ApplicationServiceApi(SimpleHttpClient):
         super(ApplicationServiceApi, self).__init__(hs)
         self.clock = hs.get_clock()
 
-        self.protocol_meta_cache = ResponseCache(hs, timeout_ms=1*HOUR_IN_MS)
+        self.protocol_meta_cache = ResponseCache(hs, timeout_ms=HOUR_IN_MS)
 
     @defer.inlineCallbacks
     def query_user(self, service, user_id):
@@ -145,8 +145,7 @@ class ApplicationServiceApi(SimpleHttpClient):
                 defer.returnValue((yield self.get_json(uri, {})))
             except Exception as ex:
                 logger.warning("query_3pe_protocol to %s threw exception %s",
-                    uri, ex
-                )
+                               uri, ex)
                 defer.returnValue({})
 
         key = (service.id, protocol)