From 426eeb209faf818c27431a3a5e97bf845a96041c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 1 Jul 2014 12:57:14 -0400 Subject: [PATCH] Fix incorrect output on disconnect for cli mode The '.' command would fail to exit the function, causing the 'help' output to occur. Fix this by having the '.' command processed in the same manner as the rest. --- TODO | 5 ++--- confluent_client/bin/confetty | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index ffbe0437..2f2ea699 100644 --- a/TODO +++ b/TODO @@ -48,6 +48,5 @@ Traceback (most recent call last): File "/usr/bin/confetty", line 211, in print_result for key in res.iterkeys(): AttributeError: 'str' object has no attribute 'iterkeys' -[root@odin ~]# confetty -/ -> cd /nodes/n3 --try to get 'health' without trailing / +-/detected/ collection + -SLP snooping: snoop for srvrequests, likel diff --git a/confluent_client/bin/confetty b/confluent_client/bin/confetty index 75a9c279..837a1bb0 100755 --- a/confluent_client/bin/confetty +++ b/confluent_client/bin/confetty @@ -456,7 +456,7 @@ def conserver_command(filehandle, command): if command[0] == '.': print("disconnect]\r") quitconfetty(fullexit=consoleonly) - if command[0] == 'b': + elif command[0] == 'b': tlvdata.send(session.connection, {'operation': 'break', 'path': currconsole}) print("break sent]\r")