Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in upgrade script. 

Handle the case when there are colons in server_name. Handle http
exceptions more gracefully.
This commit is contained in:
Erik Johnston 2014-12-16 14:07:05 +00:00
parent cb91ce5bba
commit 592ba14b36
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/upgrade_db_to_v0.6.0.py
View File

@ -21,6 +21,7 @@ from syutil.jsonutil import encode_canonical_json
import argparse import argparse
import dns.resolver import dns.resolver
import hashlib import hashlib
import httplib
import json import json
import sqlite3 import sqlite3
import syutil import syutil
@ -150,7 +151,6 @@ def get_key(server_name):
if ":" in server_name: if ":" in server_name:
target, port = server_name.split(":") target, port = server_name.split(":")
targets.append((target, int(port))) targets.append((target, int(port)))
return
try: try:
answers = dns.resolver.query("_matrix._tcp." + server_name, "SRV") answers = dns.resolver.query("_matrix._tcp." + server_name, "SRV")
for srv in answers: for srv in answers:
@ -176,6 +176,10 @@ def get_key(server_name):
return verify_keys return verify_keys
except urllib2.URLError: except urllib2.URLError:
pass pass
except urllib2.HTTPError:
pass
except httplib.HTTPException:
pass
print "Failed to get keys for %s" % (server_name,) print "Failed to get keys for %s" % (server_name,)
return {} return {}