natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cqlsh: Fix error when starting cqlsh with --debug 

Patch by Adam Holmberg; reviewed by Philip Thompson for CASSANDRA-10282
This commit is contained in:
Adam Holmberg 2015-09-09 17:14:52 -05:00 committed by Tyler Hobbs
parent 21065423c6
commit acc08aeca4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.10
* (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
* Scrub, Cleanup and Upgrade do not unmark compacting until all operations
have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
* Fix handling of streaming EOF (CASSANDRA-10206)

6
bin/cqlsh
View File

@ -2351,7 +2351,7 @@ def read_options(cmdlineargs, environment):
try:
options.connect_timeout = int(options.connect_timeout)
except ValueError:
parser.error('{} is not a valid timeout.'.format(options.connect_timeout))
parser.error('"%s" is not a valid timeout.' % (options.connect_timeout,))
options.connect_timeout = DEFAULT_CONNECT_TIMEOUT_SECONDS
options.client_timeout = option_with_default(configs.get, 'connection', 'client_timeout', '10')
@ -2447,8 +2447,8 @@ def main(options, hostname, port):
sys.exit("Can't open %r: %s" % (options.file, e))
if options.debug:
sys.stderr.write("Using CQL driver: {}\n".format(cassandra))
sys.stderr.write("Using connect timeout: {} seconds\n".format(options.connect_timeout))
sys.stderr.write("Using CQL driver: %s\n" % (cassandra,))
sys.stderr.write("Using connect timeout: %s seconds\n" % (options.connect_timeout,))
try:
shell = Shell(hostname,