Author: xedin
Date: Mon Nov 21 18:25:16 2011
New Revision: 1204637
URL: http://svn.apache.org/viewvc?rev=1204637&view=rev
Log:
skip --debug requirement to see common exceptions in CLI
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3508
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliMain.java
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliOptions.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1204637&r1=1204636&r2=1204637&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Mon Nov 21 18:25:16 2011
@@ -5,7 +5,7 @@
* add bloom filter FP rates to nodetool cfstats (CASSANDRA-3347)
* record partitioner in sstable metadata component (CASSANDRA-3407)
* add new upgradesstables nodetool command (CASSANDRA-3406)
-
+ * skip --debug requirement to see common exceptions in CLI (CASSANDRA-3508)
1.0.3
* revert name-based query defragmentation aka CASSANDRA-2503 (CASSANDRA-3491)
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java?rev=1204637&r1=1204636&r2=1204637&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
Mon Nov 21 18:25:16 2011
@@ -1482,7 +1482,7 @@ public class CliClient
sessionState.err.println(e.getWhy());
if (sessionState.debug)
- e.printStackTrace();
+ e.printStackTrace(sessionState.err);
}
}
@@ -1956,8 +1956,8 @@ public class CliClient
catch (TException e)
{
if (sessionState.debug)
- e.printStackTrace();
-
+ e.printStackTrace(sessionState.err);
+
sessionState.err.println("Login failure. Did you specify
'keyspace', 'username' and 'password'?");
}
}
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliMain.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliMain.java?rev=1204637&r1=1204636&r2=1204637&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliMain.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliMain.java
Mon Nov 21 18:25:16 2011
@@ -81,8 +81,7 @@ public class CliMain
}
catch (Exception e)
{
- if (sessionState.debug)
- e.printStackTrace();
+ e.printStackTrace(sessionState.err);
String error = (e.getCause() == null) ? e.getMessage() :
e.getCause().getMessage();
throw new RuntimeException("Exception connecting to " + server +
"/" + port + ". Reason: " + error + ".");
@@ -161,8 +160,7 @@ public class CliMain
{
sessionState.err.println("Exception retrieving information about
the cassandra node, check you have connected to the thrift port.");
- if (sessionState.debug)
- e.printStackTrace();
+ e.printStackTrace(sessionState.err);
return;
}
@@ -228,10 +226,8 @@ public class CliMain
String message = (e.getCause() == null) ? e.getMessage() :
e.getCause().getMessage();
sessionState.err.println(errorTemplate + message);
- if (sessionState.debug)
- {
+ if (!(e instanceof RuntimeException))
e.printStackTrace(sessionState.err);
- }
if (sessionState.batch || sessionState.inFileMode())
{
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliOptions.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliOptions.java?rev=1204637&r1=1204636&r2=1204637&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliOptions.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliOptions.java
Mon Nov 21 18:25:16 2011
@@ -67,7 +67,7 @@ public class CliOptions
// options without argument
options.addOption("B", BATCH_OPTION, "enabled batch mode (suppress
output; errors are fatal)");
options.addOption(null, UNFRAME_OPTION, "use cassandra server's
unframed transport");
- options.addOption(null, DEBUG_OPTION, "display stack traces");
+ options.addOption(null, DEBUG_OPTION, "display stack-traces (NOTE:
We print strack-traces in the places where it makes sense even without
--debug)");
options.addOption("?", HELP_OPTION, "usage help");
options.addOption("v", VERBOSE_OPTION, "verbose output when using
batch mode");
}
