Skip to content

Commit c37576b

Browse files
Merge pull request #145 from baloo/fixup/slave_report
binlogstream: improve slave report
2 parents b204bdd + 77b259e commit c37576b

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

pymysqlreplication/binlogstream.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,22 @@ def __init__(self, value):
4848
if tuple it will be used as (hostname, user, password, port)
4949
"""
5050

51-
if isinstance(value, tuple):
52-
l = len(value)
53-
if l > 1:
51+
if isinstance(value, (tuple, list)):
52+
try:
5453
self.hostname = value[0]
55-
if l > 2:
5654
self.username = value[1]
57-
if l > 3:
5855
self.password = value[2]
59-
if l > 4:
6056
self.port = int(value[3])
57+
except IndexError:
58+
pass
59+
elif isinstance(value, dict):
60+
try:
61+
self.hostname = value['hostname']
62+
self.username = value['username']
63+
self.password = value['password']
64+
self.port = int(value['port'])
65+
except KeyError:
66+
pass
6167
else:
6268
self.hostname = value
6369

0 commit comments

Comments
 (0)