Boot on demand

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/event/EventDispatcher.java

@@ -3,6 +3,7 @@
 import dev.vml.es.acm.core.code.ExecutionHistory;
 import dev.vml.es.acm.core.code.ExecutionQueue;
 import dev.vml.es.acm.core.code.Executor;
+import dev.vml.es.acm.core.script.AutomaticScriptScheduler;
 import dev.vml.es.acm.core.util.ResolverUtils;
 import java.util.Collections;
 import org.apache.sling.api.resource.LoginException;
@@ -29,6 +30,9 @@ public class EventDispatcher implements EventListener {
  @Reference
  private Executor executor;
 
+ @Reference
+ private AutomaticScriptScheduler scriptScheduler;
+
  @Reference
  private ResourceResolverFactory resourceResolverFactory;
 
@@ -50,6 +54,9 @@ public void onEvent(Event event) {
  case HISTORY_CLEAR:
  doHistoryClear();
  break;
+ case SCRIPT_SCHEDULER_BOOT:
+ scriptScheduler.bootOnDemand();
+ break;
  default:
  // not handled
  break;

core/src/main/java/dev/vml/es/acm/core/event/EventType.java

@@ -5,7 +5,8 @@
 
 public enum EventType {
  EXECUTOR_RESET,
- HISTORY_CLEAR;
+ HISTORY_CLEAR,
+ SCRIPT_SCHEDULER_BOOT;
 
  public static Optional<EventType> of(String name) {
  return Arrays.stream(values())

core/src/main/java/dev/vml/es/acm/core/script/AutomaticScriptScheduler.java

@@ -34,7 +34,7 @@
 import org.slf4j.LoggerFactory;
 
 @Component(
- service = ResourceChangeListener.class,
+ service = {ResourceChangeListener.class, AutomaticScriptScheduler.class},
  immediate = true,
  property = {
  ResourceChangeListener.PATHS + "=glob:" + ScriptRepository.ROOT + "/automatic/**/*.groovy",
@@ -54,12 +54,6 @@ public class AutomaticScriptScheduler implements ResourceChangeListener {
  description = "Schedules automatic scripts on instance up and script changes")
  public @interface Config {
 
- @AttributeDefinition(
- name = "Boot Delay",
- description = "Time in milliseconds to delay the boot job execution"
- )
- long bootDelay() default 1000 * 10; // 10 seconds
-
  @AttributeDefinition(
  name = "User Impersonation ID",
  description =
@@ -138,6 +132,14 @@ public void onChange(List<ResourceChange> changes) {
  }
  }
 
+ public void bootOnDemand() {
+ LOG.info("Automatic scripts booting on demand - job scheduling");
+ unscheduleBoot();
+ scheduleBoot();
+ LOG.info("Automatic scripts booting on demand - job scheduled");
+ }
+
+ // TODO on AEMaaCS scheduler refuses to schedule job during activate
  private void bootWhenInstanceUp() {
  LOG.info("Automatic scripts booting on instance up - job scheduling");
  unscheduleBoot();
@@ -157,8 +159,7 @@ private void unscheduleBoot() {
  }
 
  private void scheduleBoot() {
- Date bootDate = new Date(System.currentTimeMillis() + config.bootDelay());
- scheduler.schedule(bootJob(), configureScheduleOptions(BOOT_JOB_NAME, scheduler.AT(bootDate)));
+ scheduler.schedule(bootJob(), configureScheduleOptions(BOOT_JOB_NAME, scheduler.NOW()));
  }
 
  private ScheduleOptions configureScheduleOptions(String name, ScheduleOptions options) {