Merge pull request #342 from wttech/bugfix/embedded-package-issue

fix onInstall issue
wttech · Apr 27, 2022 · 539d41d · 539d41d
2 parents c4b3a04 + 5d9f91d
commit 539d41d
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/tools/ApmInstallHook.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/tools/ApmInstallHook.kt
@@ -60,6 +60,8 @@ class ApmInstallHook : OsgiAwareInstallHook() {
         val resolverFactory = getService(ResourceResolverFactory::class.java)
 
         try {
+            context.options.listener?.onMessage(ProgressTrackerListener.Mode.TEXT, "Installing APM scripts...", "")
+            logger.info("Installing APM scripts...")
             SlingHelper.operateTraced(resolverFactory) { resolver ->
                 executeScripts(context, currentEnvironment, currentHook, resolver)
             }
@@ -71,7 +73,6 @@ class ApmInstallHook : OsgiAwareInstallHook() {
     }
 
     private fun executeScripts(context: InstallContext, currentEnvironment: LaunchEnvironment, currentHook: String, resolver: ResourceResolver) {
-        context.options.listener.onMessage(ProgressTrackerListener.Mode.TEXT, "Installing APM scripts...", "")
         val scriptManager = getService(ScriptManager::class.java)
         val scriptFinder = getService(ScriptFinder::class.java)
         val modifiedScriptFinder = getService(ModifiedScriptFinder::class.java)
@@ -84,7 +85,8 @@ class ApmInstallHook : OsgiAwareInstallHook() {
             val result: ExecutionResult = scriptManager.process(script, ExecutionMode.AUTOMATIC_RUN, resolver)
             logStatus(context, script.path, result)
         }
-        context.options.listener.onMessage(ProgressTrackerListener.Mode.TEXT, "APM scripts installed.", "")
+        context.options.listener?.onMessage(ProgressTrackerListener.Mode.TEXT, "APM scripts installed.", "")
+        logger.info("APM scripts installed.")
     }
 
     private fun getCurrentHook(context: InstallContext): String {
@@ -104,19 +106,20 @@ class ApmInstallHook : OsgiAwareInstallHook() {
     }
 
     private fun logStatus(context: InstallContext, scriptPath: String, result: ExecutionResult) {
-        context.options.listener.onMessage(ProgressTrackerListener.Mode.TEXT, "", scriptPath)
+        context.options.listener?.onMessage(ProgressTrackerListener.Mode.TEXT, "", scriptPath)
         if (result.isSuccess) {
             logger.info("Script successfully executed: $scriptPath")
         } else {
             val packageException = PackageException("Script cannot be executed properly: $scriptPath")
-            context.options.listener.onError(ProgressTrackerListener.Mode.TEXT, "", packageException)
+            context.options.listener?.onError(ProgressTrackerListener.Mode.TEXT, "", packageException)
+            logger.error("", packageException)
             result.entries
                     .stream()
                     .filter { it.status == Status.ERROR }
                     .map { it.messages }
                     .flatMap { it.stream() }
-                    .forEach { context.options.listener.onMessage(ProgressTrackerListener.Mode.TEXT, "E", it) }
-            context.options.listener.onMessage(ProgressTrackerListener.Mode.TEXT, "APM scripts installed (with errors, check logs!)", "")
+                    .forEach { context.options.listener?.onMessage(ProgressTrackerListener.Mode.TEXT, "E", it) }
+            context.options.listener?.onMessage(ProgressTrackerListener.Mode.TEXT, "APM scripts installed (with errors, check logs!)", "")
             throw packageException
         }
     }