You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2017/08/10 06:20:44 UTC
cassandra git commit: Explicitly use e.getMessage() for log message
formatting
Repository: cassandra
Updated Branches:
refs/heads/trunk bcdbee5cd -> ba87ab4e9
Explicitly use e.getMessage() for log message formatting
patch by Zhao Yang; reviewed by Stefan Podkowinski for CASSANDRA-13723
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba87ab4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba87ab4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba87ab4e
Branch: refs/heads/trunk
Commit: ba87ab4e954ad2e537f6690953bd7ebaa069f5cd
Parents: bcdbee5
Author: Zhao Yang <zh...@gmail.com>
Authored: Mon Jul 24 18:13:14 2017 +0800
Committer: Stefan Podkowinski <st...@1und1.de>
Committed: Thu Aug 10 08:13:45 2017 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 6 ++++--
src/java/org/apache/cassandra/batchlog/BatchlogManager.java | 2 +-
.../concurrent/AbstractLocalAwareExecutorService.java | 2 +-
src/java/org/apache/cassandra/concurrent/SEPWorker.java | 4 ++--
src/java/org/apache/cassandra/db/Directories.java | 2 +-
src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java | 4 +++-
src/java/org/apache/cassandra/io/util/FileUtils.java | 2 +-
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
.../apache/cassandra/streaming/DefaultConnectionFactory.java | 2 +-
src/java/org/apache/cassandra/utils/NativeLibrary.java | 2 +-
10 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index e95a1fd..d760dce 100644
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@ -129,7 +129,9 @@ public class CassandraAuthorizer implements IAuthorizer
}
catch (RequestExecutionException | RequestValidationException e)
{
- logger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}", revokee.getRoleName(), e);
+ logger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}",
+ revokee.getRoleName(),
+ e.getMessage());
}
}
@@ -166,7 +168,7 @@ public class CassandraAuthorizer implements IAuthorizer
}
catch (RequestExecutionException | RequestValidationException e)
{
- logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", droppedResource, e);
+ logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", droppedResource, e.getMessage());
return;
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 9ca7acf..9d2867f 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@ -272,7 +272,7 @@ public class BatchlogManager implements BatchlogManagerMBean
}
catch (IOException e)
{
- logger.warn("Skipped batch replay of {} due to {}", id, e);
+ logger.warn("Skipped batch replay of {} due to {}", id, e.getMessage());
remove(id);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
index 530f46e..97dbe86 100644
--- a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
+++ b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
@@ -164,7 +164,7 @@ public abstract class AbstractLocalAwareExecutorService implements LocalAwareExe
catch (Throwable t)
{
JVMStabilityInspector.inspectThrowable(t);
- logger.warn("Uncaught exception on thread {}: {}", Thread.currentThread(), t);
+ logger.warn("Uncaught exception on thread {}: {}", Thread.currentThread(), t.getMessage());
result = t;
failure = true;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/concurrent/SEPWorker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/SEPWorker.java b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
index b3f817a..d3c87c6 100644
--- a/src/java/org/apache/cassandra/concurrent/SEPWorker.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
@@ -142,9 +142,9 @@ final class SEPWorker extends AtomicReference<SEPWorker.Work> implements Runnabl
if (assigned != null)
assigned.returnWorkPermit();
if (task != null)
- logger.error("Failed to execute task, unexpected exception killed worker: {}", t);
+ logger.error("Failed to execute task, unexpected exception killed worker: {}", t.getMessage());
else
- logger.error("Unexpected exception killed worker: {}", t);
+ logger.error("Unexpected exception killed worker: {}", t.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index 27a4d04..b637779 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -927,7 +927,7 @@ public class Directories
}
catch (IOException e)
{
- logger.error("Could not calculate the size of {}. {}", input, e);
+ logger.error("Could not calculate the size of {}. {}", input, e.getMessage());
}
return visitor.getAllocatedSize();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
index 894d77d..0a96ae4 100644
--- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java
@@ -240,7 +240,9 @@ final class HintsDispatchExecutor
}
catch (FSReadError e)
{
- logger.error("Failed to dispatch hints file {}: file is corrupted ({})", descriptor.fileName(), e);
+ logger.error("Failed to dispatch hints file {}: file is corrupted ({})",
+ descriptor.fileName(),
+ e.getMessage());
store.cleanUp(descriptor);
store.blacklist(descriptor);
throw e;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/io/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java
index 49f2fd3..5236fef 100644
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -489,7 +489,7 @@ public final class FileUtils
}
catch (IOException e)
{
- logger.error("Error while getting {} folder size. {}", folder, e);
+ logger.error("Error while getting {} folder size. {}", folder, e.getMessage());
}
return sizeArr[0];
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 7bf5806..bd25615 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1768,7 +1768,7 @@ public class StorageProxy implements StorageProxyMBean
}
catch (DigestMismatchException ex)
{
- Tracing.trace("Digest mismatch: {}", ex);
+ Tracing.trace("Digest mismatch: {}", ex.getMessage());
ReadRepairMetrics.repairedBlocking.mark();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java b/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
index 7e9dfd3..a2ad66c 100644
--- a/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
+++ b/src/java/org/apache/cassandra/streaming/DefaultConnectionFactory.java
@@ -65,7 +65,7 @@ public class DefaultConnectionFactory implements StreamConnectionFactory
throw e;
long waitms = DatabaseDescriptor.getRpcTimeout() * (long)Math.pow(2, attempts);
- logger.warn("Failed attempt {} to connect to {}. Retrying in {} ms. ({})", attempts, peer, waitms, e);
+ logger.warn("Failed attempt {} to connect to {}. Retrying in {} ms. ({})", attempts, peer, waitms, e.getMessage());
try
{
Thread.sleep(waitms);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba87ab4e/src/java/org/apache/cassandra/utils/NativeLibrary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/NativeLibrary.java b/src/java/org/apache/cassandra/utils/NativeLibrary.java
index 4cabf79..735d51a 100644
--- a/src/java/org/apache/cassandra/utils/NativeLibrary.java
+++ b/src/java/org/apache/cassandra/utils/NativeLibrary.java
@@ -329,7 +329,7 @@ public final class NativeLibrary
if (!(e instanceof LastErrorException))
throw e;
- logger.warn("fsync({}) failed, errorno ({}) {}", fd, errno(e), e);
+ logger.warn("fsync({}) failed, errorno ({}) {}", fd, errno(e), e.getMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org