From 1f7a0e77d6e72783ae1842f748caa0211c2f6e9f Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Tue, 10 Feb 2015 17:18:16 -0500 Subject: [PATCH] On SLES operating systems, hit an error on the shutdown of confluent when we call tcgetattr() with the following: termios.error: (25, 'Inappropriate ioctl for device') Before calling tcgetattr, check that the file descriptor is a tty. --- confluent_client/bin/confetty | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/confluent_client/bin/confetty b/confluent_client/bin/confetty index be67260f..0a558e94 100755 --- a/confluent_client/bin/confetty +++ b/confluent_client/bin/confetty @@ -71,7 +71,10 @@ import confluent.client as client conserversequence = '\x05c' # ctrl-e, c -oldtcattr = termios.tcgetattr(sys.stdin.fileno()) +oldtcattr = None +fd = sys.stdin +if fd.isatty(): + oldtcattr = termios.tcgetattr(fd.fileno()) netserver = None laststate = {} @@ -469,7 +472,8 @@ def quitconfetty(code=0, fullexit=False, fixterm=True): if fixterm or didconsole: currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL) fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK) - termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr) + if oldtcattr is not None: + termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr) if fullexit: sys.exit(code) else: @@ -596,6 +600,7 @@ elif shellargs: command = " ".join(shellargs) do_command(command, netserver) quitconfetty(fullexit=True, fixterm=False) + while inconsole or not doexit: if inconsole: rdylist, _, _ = select.select(