You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/01/21 09:02:42 UTC
[camel] branch master updated: (chores) camel-beanstalk: cleanups
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1593e07 (chores) camel-beanstalk: cleanups
1593e07 is described below
commit 1593e0738378f31df291a0edd0cda702a5819c9e
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Jan 21 09:49:16 2021 +0100
(chores) camel-beanstalk: cleanups
- Make it easier to spot which of the act calls raise would raise the Exception
- Remove unnecessary String formatting around logs
- Remove unnecessary log guards
---
.../component/beanstalk/BeanstalkConsumer.java | 29 +++++++++++-----------
.../component/beanstalk/BeanstalkProducer.java | 18 ++++++++------
.../beanstalk/processors/BuryCommand.java | 4 +--
.../beanstalk/processors/DeleteCommand.java | 8 +++---
.../beanstalk/processors/KickCommand.java | 5 ++--
.../component/beanstalk/processors/PutCommand.java | 7 +++---
.../beanstalk/processors/ReleaseCommand.java | 9 +++----
.../beanstalk/processors/TouchCommand.java | 8 +++---
8 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
index 540c5f2..b652e9e 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
@@ -225,7 +225,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
try {
executor.submit(new RunCommand(successCommand, exchange)).get();
} catch (Exception e) {
- LOG.error(String.format("Could not run completion of exchange %s", exchange), e);
+ LOG.error("Could not run completion of exchange {}", exchange, e);
}
}
@@ -234,9 +234,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
try {
executor.submit(new RunCommand(failureCommand, exchange)).get();
} catch (Exception e) {
- LOG.error(
- String.format("%s could not run failure of exchange %s", failureCommand.getClass().getName(), exchange),
- e);
+ LOG.error("{} could not run failure of exchange {}", failureCommand.getClass().getName(), exchange, e);
}
}
@@ -252,20 +250,23 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
@Override
public void run() {
try {
- try {
- command.act(client, exchange);
- } catch (BeanstalkException e) {
- LOG.warn(String.format("Post-processing %s of exchange %s failed, retrying.",
- command.getClass().getName(), exchange), e);
- resetClient();
- command.act(client, exchange);
- }
+ doPostProcess();
} catch (final Exception e) {
- LOG.error(String.format("%s could not post-process exchange %s", command.getClass().getName(), exchange),
- e);
+ LOG.error("{} could not post-process exchange {}", command.getClass().getName(), exchange, e);
exchange.setException(e);
}
}
+
+ private void doPostProcess() throws Exception {
+ try {
+ command.act(client, exchange);
+ } catch (BeanstalkException e) {
+ LOG.warn("Post-processing {} of exchange {} failed, retrying.", command.getClass().getName(),
+ exchange, e);
+ resetClient();
+ command.act(client, exchange);
+ }
+ }
}
}
}
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java
index 393cff7..25ac782 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkProducer.java
@@ -109,13 +109,7 @@ public class BeanstalkProducer extends DefaultAsyncProducer {
@Override
public void run() {
try {
- try {
- command.act(client, exchange);
- } catch (BeanstalkException e) {
- /* Retry one time */
- resetClient();
- command.act(client, exchange);
- }
+ doRun();
} catch (Throwable t) {
exchange.setException(t);
} finally {
@@ -124,5 +118,15 @@ public class BeanstalkProducer extends DefaultAsyncProducer {
}
}
}
+
+ private void doRun() throws Exception {
+ try {
+ command.act(client, exchange);
+ } catch (BeanstalkException e) {
+ /* Retry one time */
+ resetClient();
+ command.act(client, exchange);
+ }
+ }
}
}
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/BuryCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/BuryCommand.java
index 9231086..74be9a2 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/BuryCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/BuryCommand.java
@@ -39,9 +39,9 @@ public class BuryCommand extends DefaultCommand {
final boolean result = client.bury(jobId, priority);
if (!result && LOG.isWarnEnabled()) {
- LOG.warn(String.format("Failed to bury job %d (with priority %d)", jobId, priority));
+ LOG.warn("Failed to bury job {} (with priority {})", jobId, priority);
} else if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Job %d buried with priority %d. Result is %b", jobId, priority, result));
+ LOG.debug("Job {} buried with priority {}. Result is {}", jobId, priority, result);
}
answerWith(exchange, Headers.RESULT, result);
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DeleteCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DeleteCommand.java
index 77fb71e..1eb203f 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DeleteCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/DeleteCommand.java
@@ -36,10 +36,10 @@ public class DeleteCommand extends DefaultCommand {
public void act(final Client client, final Exchange exchange) throws NoSuchHeaderException {
final long jobId = BeanstalkExchangeHelper.getJobID(exchange);
final boolean result = client.delete(jobId);
- if (!result && LOG.isWarnEnabled()) {
- LOG.warn(String.format("Failed to delete job %d", jobId));
- } else if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Job %d deleted. Result is %b", jobId, result));
+ if (!result) {
+ LOG.warn("Failed to delete job {}", jobId);
+ } else {
+ LOG.debug("Job {} deleted. Result is {}", jobId, result);
}
answerWith(exchange, Headers.RESULT, result);
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/KickCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/KickCommand.java
index 991e237..a977388 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/KickCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/KickCommand.java
@@ -36,9 +36,8 @@ public class KickCommand extends DefaultCommand {
public void act(final Client client, final Exchange exchange) throws NoSuchHeaderException, InvalidPayloadException {
final Integer jobs = exchange.getIn().getMandatoryBody(Integer.class);
final int result = client.kick(jobs);
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Kick %d jobs. Kicked %d actually.", jobs, result));
- }
+
+ LOG.debug("Kick {} jobs. Kicked {} actually.", jobs, result);
final Message answer = getAnswerMessage(exchange);
answer.setBody(result, Integer.class);
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/PutCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/PutCommand.java
index 8c05125..1ae82c8 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/PutCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/PutCommand.java
@@ -42,10 +42,9 @@ public class PutCommand extends DefaultCommand {
final int timeToRun = BeanstalkExchangeHelper.getTimeToRun(endpoint, in);
final long jobId = client.put(priority, delay, timeToRun, in.getBody(byte[].class));
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Created job %d with priority %d, delay %d seconds and time to run %d", jobId, priority,
- delay, timeToRun));
- }
+
+ LOG.debug("Created job {} with priority {}, delay {} seconds and time to run {}", jobId, priority, delay,
+ timeToRun);
answerWith(exchange, Headers.JOB_ID, jobId);
}
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/ReleaseCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/ReleaseCommand.java
index b39fbdb..202b991 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/ReleaseCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/ReleaseCommand.java
@@ -42,11 +42,10 @@ public class ReleaseCommand extends DefaultCommand {
final int delay = BeanstalkExchangeHelper.getDelay(endpoint, in);
final boolean result = client.release(jobId, priority, delay);
- if (!result && LOG.isWarnEnabled()) {
- LOG.warn(String.format("Failed to release job %d (priority %d, delay %d)", jobId, priority, delay));
- } else if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Job %d released with priority %d, delay %d seconds. Result is %b", jobId, priority, delay,
- result));
+ if (!result) {
+ LOG.warn("Failed to release job {} (priority {}, delay {})", jobId, priority, delay);
+ } else {
+ LOG.debug("Job {} released with priority {}, delay {} seconds. Result is {}", jobId, priority, delay, result);
}
answerWith(exchange, Headers.RESULT, result);
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/TouchCommand.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/TouchCommand.java
index c98cc72..233d00b 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/TouchCommand.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/processors/TouchCommand.java
@@ -36,10 +36,10 @@ public class TouchCommand extends DefaultCommand {
public void act(final Client client, final Exchange exchange) throws NoSuchHeaderException {
final Long jobId = ExchangeHelper.getMandatoryHeader(exchange, Headers.JOB_ID, Long.class);
final boolean result = client.touch(jobId);
- if (!result && LOG.isWarnEnabled()) {
- LOG.warn(String.format("Failed to touch job %d", jobId));
- } else if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Job %d touched. Result is %b", jobId, result));
+ if (!result) {
+ LOG.warn("Failed to touch job {}", jobId);
+ } else {
+ LOG.debug("Job {} touched. Result is {}", jobId, result);
}
answerWith(exchange, Headers.RESULT, result);