Skip to content

fix String.format issues #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2012
+7 −7
Merged

fix String.format issues #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion driver-core/src/main/java/com/datastax/driver/core/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private void initializeTransport() throws ConnectionException {
case READY:
break;
case ERROR:
throw defunct(new TransportException(address, String.format("Error initializing connection", ((ErrorMessage)response).error)));
throw defunct(new TransportException(address, String.format("Error initializing connection: %s", ((ErrorMessage)response).error.getMessage())));
case AUTHENTICATE:
CredentialsMessage creds = new CredentialsMessage();
creds.credentials.putAll(factory.authProvider.getAuthInfos(address));
Expand Down
12 changes: 6 additions & 6 deletions driver-core/src/main/java/com/datastax/driver/core/policies/LoggingRetryPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public RetryDecision onReadTimeout(ConsistencyLevel cl, int requiredResponses, i
RetryDecision decision = policy.onReadTimeout(cl, requiredResponses, receivedResponses, dataRetrieved, nbRetry);
switch (decision.getType()) {
case IGNORE:
String f1 = "Ignoring read timeout (initial consistency: %s, required responses: %i, received responses: %i, data retrieved: %b, retries: %i)";
String f1 = "Ignoring read timeout (initial consistency: %s, required responses: %d, received responses: %d, data retrieved: %b, retries: %d)";
logger.info(String.format(f1, cl, requiredResponses, receivedResponses, dataRetrieved, nbRetry));
break;
case RETRY:
String f2 = "Retrying on read timeout at consistency %s (initial consistency: %s, required responses: %i, received responses: %i, data retrieved: %b, retries: %i)";
String f2 = "Retrying on read timeout at consistency %s (initial consistency: %s, required responses: %d, received responses: %d, data retrieved: %b, retries: %d)";
logger.info(String.format(f2, cl(cl, decision), cl, requiredResponses, receivedResponses, dataRetrieved, nbRetry));
break;
}
Expand All @@ -51,11 +51,11 @@ public RetryDecision onWriteTimeout(ConsistencyLevel cl, WriteType writeType, in
RetryDecision decision = policy.onWriteTimeout(cl, writeType, requiredAcks, receivedAcks, nbRetry);
switch (decision.getType()) {
case IGNORE:
String f1 = "Ignoring write timeout (initial consistency: %s, write type: %s, required acknowledgments: %i, received acknowledgments: %i, retries: %i)";
String f1 = "Ignoring write timeout (initial consistency: %s, write type: %s, required acknowledgments: %d, received acknowledgments: %d, retries: %d)";
logger.info(String.format(f1, cl, writeType, requiredAcks, receivedAcks, nbRetry));
break;
case RETRY:
String f2 = "Retrying on write timeout at consistency %s(initial consistency: %s, write type: %s, required acknowledgments: %i, received acknowledgments: %i, retries: %i)";
String f2 = "Retrying on write timeout at consistency %s(initial consistency: %s, write type: %s, required acknowledgments: %d, received acknowledgments: %d, retries: %d)";
logger.info(String.format(f2, cl(cl, decision), cl, writeType, requiredAcks, receivedAcks, nbRetry));
break;
}
Expand All @@ -66,11 +66,11 @@ public RetryDecision onUnavailable(ConsistencyLevel cl, int requiredReplica, int
RetryDecision decision = policy.onUnavailable(cl, requiredReplica, aliveReplica, nbRetry);
switch (decision.getType()) {
case IGNORE:
String f1 = "Ignoring unavailable exception (initial consistency: %s, required replica: %i, alive replica: %i, retries: %i)";
String f1 = "Ignoring unavailable exception (initial consistency: %s, required replica: %d, alive replica: %d, retries: %d)";
logger.info(String.format(f1, cl, requiredReplica, aliveReplica, nbRetry));
break;
case RETRY:
String f2 = "Retrying on unavailable exception at consistency %s (initial consistency: %s, required replica: %i, alive replica: %i, retries: %i)";
String f2 = "Retrying on unavailable exception at consistency %s (initial consistency: %s, required replica: %d, alive replica: %d, retries: %d)";
logger.info(String.format(f2, cl(cl, decision), cl, requiredReplica, aliveReplica, nbRetry));
break;
}
Expand Down