Merge pull request #996 from d3sw/release-v2.56.0

Merge Release v2.56.0 to Main
d3sw · Feb 21, 2024 · 0c64776 · 0c64776
2 parents cc7a781 + 747624c
commit 0c64776
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/http/GenericHttpTask.java b/contribs/src/main/java/com/netflix/conductor/contribs/http/GenericHttpTask.java
@@ -191,7 +191,7 @@ HttpResponse httpCall(Input input, Task task, Workflow workflow, WorkflowExecuto
 			response.headers = cr.getHeaders();
 			return response;
 		} catch (UniformInterfaceException ex) {
-			logger.error(ex.getMessage(), ex);
+			logger.error("HTTP task failed for workflowId{}, taskId {}, taskRefname {}, url {}, errorMessage {}", workflow.getWorkflowId(), task.getTaskId(), task.getReferenceTaskName(), input.getUri(), ex.getMessage());
 			ClientResponse cr = ex.getResponse();
 			logger.error("Status Code: {}", cr.getStatus());
 			if (cr.getStatus() > 199 && cr.getStatus() < 300) {
@@ -204,11 +204,10 @@ HttpResponse httpCall(Input input, Task task, Workflow workflow, WorkflowExecuto
 				return response;
 			} else {
 				String reason = cr.getEntity(String.class);
-				logger.error(reason, ex);
 				throw new Exception(reason);
 			}
 		} catch (Exception ex) {
-			logger.error(ex.getMessage(), ex);
+			logger.error("HTTP task failed for workflowId{}, taskId {}, taskRefname {}, url {}, errorMessage {}", workflow.getWorkflowId(), task.getTaskId(), task.getReferenceTaskName(), input.getUri(), ex.getMessage());
 			response.body = null;
 			response.headers = null;
 			response.statusCode = -1;

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowSweeper.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowSweeper.java
@@ -115,7 +115,9 @@ public void sweep(List<String> workflowIds, WorkflowExecutor executor) throws Ex
 
             Future<?> future = es.submit(() -> {
                 NDC.push("sweep-" + UUID.randomUUID().toString());
-                logger.debug("Calling decider from sweeper for workflow {}", workflowId);
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Calling decider from sweeper for workflow {}", workflowId);
+                }
                 try {
 
                     WorkflowContext ctx = new WorkflowContext(config.getAppId());