summary refs log tree commit diff
path: root/scripts-dev/tail-synapse.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-11-03 12:14:24 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-11-03 12:14:24 +0000
commit6e7488ce1166ffb1f70777b4db2e9008f3303a04 (patch)
tree4cd62ccc22a7eb9630b875e18e05cf4017f62218 /scripts-dev/tail-synapse.py
parentMerge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_direct... (diff)
parentMerge branch 'release-v0.33.8' (diff)
downloadsynapse-6e7488ce1166ffb1f70777b4db2e9008f3303a04.tar.xz
merge master into dinsic, again...
Diffstat (limited to 'scripts-dev/tail-synapse.py')
-rw-r--r--scripts-dev/tail-synapse.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts-dev/tail-synapse.py b/scripts-dev/tail-synapse.py
index 18be711e92..7c9985d9f0 100644
--- a/scripts-dev/tail-synapse.py
+++ b/scripts-dev/tail-synapse.py
@@ -1,8 +1,9 @@
-import requests
 import collections
+import json
 import sys
 import time
-import json
+
+import requests
 
 Entry = collections.namedtuple("Entry", "name position rows")
 
@@ -30,11 +31,11 @@ def parse_response(content):
 
 
 def replicate(server, streams):
-    return parse_response(requests.get(
-        server + "/_synapse/replication",
-        verify=False,
-        params=streams
-    ).content)
+    return parse_response(
+        requests.get(
+            server + "/_synapse/replication", verify=False, params=streams
+        ).content
+    )
 
 
 def main():
@@ -45,16 +46,16 @@ def main():
         try:
             streams = {
                 row.name: row.position
-                for row in replicate(server, {"streams":"-1"})["streams"].rows
+                for row in replicate(server, {"streams": "-1"})["streams"].rows
             }
-        except requests.exceptions.ConnectionError as e:
+        except requests.exceptions.ConnectionError:
             time.sleep(0.1)
 
     while True:
         try:
             results = replicate(server, streams)
-        except:
-            sys.stdout.write("connection_lost("+ repr(streams) + ")\n")
+        except Exception:
+            sys.stdout.write("connection_lost(" + repr(streams) + ")\n")
             break
         for update in results.values():
             for row in update.rows:
@@ -62,6 +63,5 @@ def main():
             streams[update.name] = update.position
 
 
-
-if __name__=='__main__':
+if __name__ == '__main__':
     main()