Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions zkadmin/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class Session(object):
def __init__(self, session):
m = re.search('/(\d+\.\d+\.\d+\.\d+):(\d+)\[(\d+)\]\((.*)\)', session)
m = re.search('/(\d+\.\d+\.\d+\.\d+):(\d+)\[(\d+)\]\((.*)', session)
self.host = m.group(1)
self.port = m.group(2)
self.interest_ops = m.group(3)
Expand All @@ -32,20 +32,27 @@ def __init__(self, server):
sio = StringIO.StringIO(stat)
line = sio.readline()
m = re.search('.*: (\d+\.\d+\.\d+)-.*', line)
self.version = m.group(1)
try:
self.version = m.group(1)
except:
self.version = 'Not available'

sio.readline()
self.sessions = []
for line in sio:
if not line.strip():
break
self.sessions.append(Session(line.strip()))
if line.startswith('/', 1, 2):
self.sessions.append(Session(line.strip()))
break
for line in sio:
attr, value = line.split(':')
attr = attr.strip().replace(" ", "_").replace("/", "_").lower()
self.__dict__[attr] = value.strip()

self.min_latency, self.avg_latency, self.max_latency = self.latency_min_avg_max.split("/")

try:
self.min_latency, self.avg_latency, self.max_latency = self.latency_min_avg_max.split("/")
except:
self.min_latency, self.avg_latency, self.max_latency = 0,0,0

self.envi = []
sio = StringIO.StringIO(envi)
for line in sio:
Expand Down