Better logging

Author: krystian-panek-vmltech

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

@@ -132,15 +132,17 @@ public void onChange(List<ResourceChange> changes) {
     }
 
     private void bootWhenInstanceUp() {
-        LOG.info("Automatic scripts booting on instance up");
+        LOG.info("Automatic scripts booting on instance up - job scheduling");
         unscheduleBoot();
         scheduleBoot();
+        LOG.info("Automatic scripts booting on instance up - job scheduled");
     }
 
     private void bootWhenScriptsChanged() {
-        LOG.info("Automatic scripts booting on script changes");
+        LOG.info("Automatic scripts booting on script changes - job scheduling");
         unscheduleBoot();
         scheduleBoot();
+        LOG.info("Automatic scripts booting on script changes - job scheduled");
     }
 
     private void unscheduleBoot() {
@@ -168,13 +170,15 @@ private ScheduleResult determineSchedule(Script script, ResourceResolver resourc
 
     private Job bootJob() {
         return context -> {
+            LOG.info("Automatic scripts booting - job started");
             unscheduleScripts();
             if (awaitInstanceHealthy(
                     "Automatic scripts queueing and scheduling",
                     config.healthCheckRetryCountBoot(),
                     config.healthCheckRetryInterval())) {
                 queueAndScheduleScripts();
             }
+            LOG.info("Automatic scripts booting - job finished");
         };
     }
 
@@ -264,28 +268,28 @@ private void scheduleCronScript(Script script, CronSchedule schedule) {
 
     private Job cronJob(String scriptPath) {
         return context -> {
-            if (!awaitInstanceHealthy(
+            LOG.info("Cron schedule script '{}' - job started", scriptPath);
+            if (awaitInstanceHealthy(
                     String.format("Cron schedule script '%s' queueing", scriptPath),
                     config.healthCheckRetryCountCron(),
                     config.healthCheckRetryInterval())) {
-                return;
-            }
-
-            try (ResourceResolver resourceResolver = ResolverUtils.contentResolver(resourceResolverFactory, null)) {
-                ScriptRepository scriptRepository = new ScriptRepository(resourceResolver);
-                Script script = scriptRepository.read(scriptPath).orElse(null);
-                if (script == null) {
-                    LOG.error("Cron schedule script '{}' not found in repository!", scriptPath);
-                } else {
-                    if (checkScript(script, resourceResolver)) {
-                        queueScript(script);
+                try (ResourceResolver resourceResolver = ResolverUtils.contentResolver(resourceResolverFactory, null)) {
+                    ScriptRepository scriptRepository = new ScriptRepository(resourceResolver);
+                    Script script = scriptRepository.read(scriptPath).orElse(null);
+                    if (script == null) {
+                        LOG.error("Cron schedule script '{}' not found in repository!", scriptPath);
                     } else {
-                        LOG.info("Cron schedule script '{}' not eligible for queueing!", scriptPath);
+                        if (checkScript(script, resourceResolver)) {
+                            queueScript(script);
+                        } else {
+                            LOG.info("Cron schedule script '{}' not eligible for queueing!", scriptPath);
+                        }
                     }
+                } catch (LoginException e) {
+                    LOG.error("Cannot access repository while queueing cron schedule script '{}'!", scriptPath, e);
                 }
-            } catch (LoginException e) {
-                LOG.error("Cannot access repository while queueing cron schedule script '{}'!", scriptPath, e);
             }
+            LOG.info("Cron schedule script '{}' - job finished", scriptPath);
         };
     }
 

test/project/setup.sh

@@ -59,24 +59,25 @@ add_vendor_package() {
 
   echo "Appending package '$groupId:$artifactId:$version' to '$all_pom'"
 
-  xml_append_block_if_missing "$all_pom" "$dep_marker_id" "<dependencies>" "$dep_block"
-  xml_append_block_if_missing "$all_pom" "$emb_marker_id" "<embeddeds>" "$emb_block"
+  xml_append_block_if_missing "$all_pom" "$dep_marker_id" "</dependencies>" "$dep_block"
+  xml_append_block_if_missing "$all_pom" "$emb_marker_id" "</embeddeds>" "$emb_block"
 }
 
 xml_append_block_if_missing() {
   local file="$1"
   local marker_id="$2"
-  local insert_after="$3"
+  local insert_before="$3"
   local block="$4"
   local marker="<!-- $marker_id -->"
   local found=0
 
   if ! grep -q "$marker" "$file"; then
     while IFS= read -r line; do
-      echo "$line"
-      if [[ $found -eq 0 && "$line" == *"$insert_after"* ]]; then
-        printf "%s\n%s\n" "$marker" "$block"
+      if [[ $found -eq 0 && "$line" == *"$insert_before"* ]]; then
+        printf "%s\n%s\n%s\n" "$marker" "$block" "$line"
         found=1
+      else
+        echo "$line"
       fi
     done < "$file" > "$file.tmp" && mv "$file.tmp" "$file"
   fi