Merge branch 'Netflix:main' into oracle_persistence

maheshyaddanapudi · May 28, 2022 · e02c82f · e02c82f
2 parents 20810a6 + e581b14
commit e02c82f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/WHOSUSING.md b/WHOSUSING.md
@@ -11,3 +11,5 @@ We would like to keep track of whose using Conductor. Please send a pull request
 * [JP Morgan Chase](www.chase.com) [[@maheshyaddanapudi](https://github.com/maheshyaddanapudi)]
 *  [Orkes ](www.orkes.io)[[@CherishSantoshi](https://github.com/CherishSantoshi)]
 *  [313X](https://313x.com.br)[[@dalmoveras](https://github.com/dalmoveras)]
+*  [Supercharge](https://supercharge.io)[[@team-supercharge](https://github.com/team-supercharge)]
+
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/DeciderService.java b/core/src/main/java/com/netflix/conductor/core/execution/DeciderService.java
@@ -633,7 +633,7 @@ void checkWorkflowTimeout(WorkflowModel workflow) {
 
         switch (workflowDef.getTimeoutPolicy()) {
             case ALERT_ONLY:
-                LOGGER.info(reason);
+                LOGGER.info("{} {}", workflow.getWorkflowId(), reason);
                 Monitors.recordWorkflowTermination(
                         workflow.getWorkflowName(),
                         WorkflowModel.Status.TIMED_OUT,

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -990,7 +990,7 @@ public WorkflowModel terminateWorkflow(
             workflowStatusListener.onWorkflowTerminatedIfEnabled(workflow);
             Monitors.recordWorkflowTermination(
                     workflow.getWorkflowName(), workflow.getStatus(), workflow.getOwnerApp());
-
+            LOGGER.info("Workflow {} is terminated because of {}", workflowId, reason);
             List<TaskModel> tasks = workflow.getTasks();
             try {
                 // Remove from the task queue if they were there

diff --git a/settings.gradle b/settings.gradle
@@ -12,7 +12,7 @@
  */
 
 plugins {
-    id "com.gradle.enterprise" version "3.10"
+    id "com.gradle.enterprise" version "3.10.1"
 }
 
 gradleEnterprise {