#791 revised defaults and logging

CenturyLinkCloud · Jan 7, 2020 · 720f8e9 · 720f8e9
1 parent 5b2ef80
commit 720f8e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/docs/_docs/guides/configuration.md b/docs/_docs/guides/configuration.md
@@ -178,7 +178,7 @@ title: MDW Configuration
       fallback:
         stagger: 60  # seconds offset between scheduling scan for each activity - default=30
         max: 20  # maximum number of activity instances to trigger per cycle - default=100
-        age: 1200 # minimum age of waiting activity instances to process - default=600
+        age: 1200 # minimum age in seconds of waiting activity instances to process - default=600
     timer.wait.fallback.enabled: true  # enable fallback processing for timer wait activities - default=false
     dependencies.wait.fallback.enabled: true  # enable fallback processing for dependencies waits - default=false
 

diff --git a/mdw-workflow/src/com/centurylink/mdw/workflow/activity/event/WaitActivityFallback.java b/mdw-workflow/src/com/centurylink/mdw/workflow/activity/event/WaitActivityFallback.java
@@ -83,15 +83,15 @@ public int getStagger() {
      * Max batch size per check cycle.  From property "mdw.wait.fallback.max", with default of 1000.
      */
     public int getMaxActivities() {
-        return PropertyManager.getIntegerProperty(PropertyNames.MDW_WAIT_FALLBACK_MAX, 1000);
+        return PropertyManager.getIntegerProperty(PropertyNames.MDW_WAIT_FALLBACK_MAX, 100);
     }
 
     /**
      * Min age for activity to be processed (in seconds).
      * From property "mdw.wait.fallback.age", with default of 300.
      */
     public int getMinActivityAge() {
-        return PropertyManager.getIntegerProperty(PropertyNames.MDW_WAIT_FALLBACK_AGE, 300);
+        return PropertyManager.getIntegerProperty(PropertyNames.MDW_WAIT_FALLBACK_AGE, 600);
     }
 
     private Map<Activity,ScheduledFuture> activitySchedules = new HashMap<>();
@@ -111,12 +111,18 @@ final public void onStartup() throws StartupException {
                             ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, new FallbackThreadFactory(activity));
                             ScheduledFuture schedule = scheduler.scheduleAtFixedRate(() -> {
                                 try {
-                                    for (ActivityInstance activityInstance : getActivityInstances(activity)) {
+                                    List<ActivityInstance> activityInstances = getActivityInstances(activity);
+                                    String msg = "Found " + activityInstances.size() + " waiting instances of " + getActivityLabel(activity);
+                                    if (activityInstances.isEmpty())
+                                        logger.debug(msg);
+                                    else
+                                        logger.info(msg);
+                                    for (ActivityInstance activityInstance : activityInstances) {
                                         try {
                                             process(activity, activityInstance);
                                         }
                                         catch (Exception ex) {
-                                            String msg = "Processing failed for " + getActivityLabel(activity);
+                                            msg = "Processing failed for " + getActivityLabel(activity);
                                             logger.error(msg, ex);
                                             ActivityLogger.persist(activityInstance.getProcessInstanceId(), activityInstance.getId(), LogLevel.ERROR, msg, ex);
                                         }