From 23f025eb71eb611368bf488fd3451e7c350c871e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 6 Jan 2016 11:40:31 -0500 Subject: [PATCH] Use a plain incrementing session id UUIDs when a simple number will do are harder to use. Change to a simple increment id. This could cause an issue with multiple management nodes, but I think the sessions should be contained to the instance used. --- confluent_server/confluent/shellserver.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/shellserver.py b/confluent_server/confluent/shellserver.py index 0c95e60f..6ba2cfd5 100644 --- a/confluent_server/confluent/shellserver.py +++ b/confluent_server/confluent/shellserver.py @@ -88,10 +88,13 @@ class ShellSession(consoleserver.ConsoleSession): def connect_session(self): global activesessions tenant = self.configmanager.tenant - if self.sessionid is None: - self.sessionid = str(uuid.uuid4()) if (self.configmanager.tenant, self.node) not in activesessions: activesessions[(tenant, self.node)] = {} + if self.sessionid is None: + self.sessionid = 1 + while str(self.sessionid) in activesessions[(tenant, self.node)]: + self.sessionid += 1 + self.sessionid = str(self.sessionid) if self.sessionid not in activesessions[(tenant, self.node)]: activesessions[(tenant, self.node)][self.sessionid] = _ShellHandler(self.node, self.configmanager) self.conshdl = activesessions[(self.configmanager.tenant, self.node)][self.sessionid]