MID-8842 ninja - improved progress reporting for older actions

Evolveum · Aug 4, 2023 · 5cb0469 · 5cb0469
1 parent fb38523
commit 5cb0469
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/RunSqlAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/RunSqlAction.java
@@ -223,8 +223,6 @@ private void executeScripts(@NotNull DataSource dataSource, @NotNull List<File>
                     }
 
                     stmt.close();
-
-                    log.info("Script executed successfully");
                 }
 
                 log.info(ConsoleFormat.formatSuccessMessage("Scripts executed successfully."));

diff --git a/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeInstallationAction.java b/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeInstallationAction.java
@@ -8,6 +8,8 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.Set;
 
+import com.evolveum.midpoint.ninja.util.ConsoleFormat;
+
 import org.apache.commons.io.FileUtils;
 
 import com.evolveum.midpoint.ninja.action.Action;
@@ -34,6 +36,8 @@ public Void execute() throws Exception {
             throw new NinjaException("Undefined midpoint installation directory");
         }
 
+        log.info(ConsoleFormat.formatMessageWithInfoParameters("Midpoint installation directory: " + midpointInstallation.getPath()));
+
         File backupDirectory = null;
         if (backupFiles) {
             backupDirectory = new File(midpointInstallation, ".backup-" + System.currentTimeMillis());
@@ -46,6 +50,8 @@ public Void execute() throws Exception {
             backupAndCopyFiles(file, new File(midpointInstallation, file.getName()), backupFiles, backupDirectory);
         }
 
+        log.info(ConsoleFormat.formatSuccessMessage("Installation upgraded successfully"));
+
         return null;
     }
 

diff --git a/...ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ProgressReporterWorker.java b/...ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ProgressReporterWorker.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.BlockingQueue;
 
+import com.evolveum.midpoint.ninja.impl.Log;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.ninja.util.OperationStatus;
@@ -24,6 +25,9 @@ public ProgressReporterWorker(NinjaContext context,
 
     @Override
     public void run() {
+        final Log log = context.getLog();
+        log.info("Progress reporter starting");
+
         while (!shouldConsumerStop()) {
             if (operation.isStarted() || operation.isProducerFinished()) {
                 operation.print(context.getLog());

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/OperationStatus.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/OperationStatus.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.evolveum.midpoint.ninja.impl.Log;
+import com.evolveum.midpoint.ninja.impl.LogLevel;
 import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -144,13 +145,15 @@ public String print() {
                 + errorCount.get()
                 + ", skipped: "
                 + skippedCount.get()
-                + ", avg processed: "
+                + ", avg.: "
                 + NinjaUtils.DECIMAL_FORMAT.format(getAvgRequestPerSecond())
                 + "obj/s";
     }
 
     public void print(Log log) {
-        log.info(print());
+        log.info(
+                ConsoleFormat.rewriteConsoleLine(
+                        ConsoleFormat.formatLogMessage(LogLevel.INFO, print())));
 
         lastPrintoutNow();
     }