From d8ddb02d2fcbad4041115276bd04f5912316193e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Sep 2024 17:29:17 +0200 Subject: [PATCH] Improve logging --- .../saveactions/core/component/Engine.java | 38 ++++++++++++------- .../processors/java/InspectionRunnable.java | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/software/xdev/saveactions/core/component/Engine.java b/src/main/java/software/xdev/saveactions/core/component/Engine.java index f7afbad..5687fc9 100644 --- a/src/main/java/software/xdev/saveactions/core/component/Engine.java +++ b/src/main/java/software/xdev/saveactions/core/component/Engine.java @@ -79,7 +79,10 @@ public void processPsiFilesIfNecessary( } if(!this.storage.isEnabled(this.activation)) { - LOGGER.info(String.format("Action \"%s\" not enabled on %s", this.activation.getText(), this.project)); + LOGGER.info(String.format( + "Action \"%s\" not enabled on %s", + this.activation.getText(), + this.project.getName())); return; } @@ -87,14 +90,14 @@ public void processPsiFilesIfNecessary( final Set psiFilesEligible = this.getEligiblePsiFiles(indicator, async); if(psiFilesEligible.isEmpty()) { - LOGGER.info("No files are eligible"); + LOGGER.info("No files are eligible - " + this.project.getName()); return; } final List processorsEligible = this.getEligibleProcessors(indicator, psiFilesEligible); if(processorsEligible.isEmpty()) { - LOGGER.info("No processors are eligible"); + LOGGER.info("No processors are eligible - " + this.project.getName()); return; } @@ -105,7 +108,7 @@ public void processPsiFilesIfNecessary( private Set getEligiblePsiFiles(final @NotNull ProgressIndicator indicator, final boolean async) { - LOGGER.info(String.format("Processing %s files %s mode %s", this.project, this.psiFiles, this.mode)); + LOGGER.info(String.format("Processing %s files %s mode %s", this.project.getName(), this.psiFiles, this.mode)); indicator.checkCanceled(); indicator.setText2("Collecting files to process"); @@ -124,7 +127,7 @@ private Set getEligiblePsiFiles(final @NotNull ProgressIndicator indica final @NotNull ProgressIndicator indicator, final Set psiFilesEligible) { - LOGGER.info(String.format("Start processors (%d)", this.processors.size())); + LOGGER.info(String.format("Start processors (%d) - %s", this.processors.size(), this.project.getName())); indicator.checkCanceled(); indicator.setText2("Collecting processors"); @@ -142,7 +145,7 @@ private void flushPsiFiles( final boolean async, final Set psiFilesEligible) { - LOGGER.info(String.format("Flushing files (%d)", psiFilesEligible.size())); + LOGGER.info(String.format("Flushing files (%d) - %s", psiFilesEligible.size(), this.project.getName())); indicator.checkCanceled(); indicator.setText2("Flushing files"); @@ -176,7 +179,11 @@ private void execute( final AtomicInteger executedCount = new AtomicInteger(); final List>> results = saveCommands.stream() .map(command -> { - LOGGER.info(String.format("Execute command %s on %d files", command, psiFilesEligible.size())); + LOGGER.info(String.format( + "Execute command %s on %d files - %s", + command, + psiFilesEligible.size(), + this.project.getName())); indicator.checkCanceled(); indicator.setText2("Executing '" + command.getAction().getText() + "'"); @@ -189,9 +196,12 @@ private void execute( return entry; }) .toList(); - LOGGER.info(String.format("Exit engine with results %s", results.stream() - .map(entry -> entry.getKey() + ":" + entry.getValue()) - .toList())); + LOGGER.info(String.format( + "Exit engine with results %s - %s", + results.stream() + .map(entry -> entry.getKey() + ":" + entry.getValue()) + .toList(), + this.project.getName())); } private boolean isPsiFileEligible(final Project project, final PsiFile psiFile) @@ -211,7 +221,7 @@ private boolean isProjectValid(final Project project) final boolean valid = project.isInitialized() && !project.isDisposed(); if(!valid) { - LOGGER.info("Project invalid. Either not initialized or disposed."); + LOGGER.info(String.format("Project %s invalid. Either not initialized or disposed", project.getName())); } return valid; } @@ -260,7 +270,7 @@ private boolean isPsiFileFresh(final PsiFile psiFile) final boolean isFresh = psiFile.getModificationStamp() != 0; if(!isFresh) { - LOGGER.info(String.format("File %s is not fresh.", psiFile)); + LOGGER.info(String.format("File %s is not fresh", psiFile)); } return isFresh; } @@ -270,7 +280,7 @@ private boolean isPsiFileValid(final PsiFile psiFile) final boolean valid = psiFile.isValid(); if(!valid) { - LOGGER.info(String.format("File %s is not valid.", psiFile)); + LOGGER.info(String.format("File %s is not valid", psiFile)); } return valid; } @@ -280,7 +290,7 @@ private boolean hasPsiFileText(final PsiFile psiFile) final boolean valid = psiFile.getTextRange() != null; if(!valid) { - LOGGER.info(String.format("File %s has no text.", psiFile)); + LOGGER.info(String.format("File %s has no text", psiFile)); } return valid; } diff --git a/src/main/java/software/xdev/saveactions/processors/java/InspectionRunnable.java b/src/main/java/software/xdev/saveactions/processors/java/InspectionRunnable.java index 4ee46a4..50d0074 100644 --- a/src/main/java/software/xdev/saveactions/processors/java/InspectionRunnable.java +++ b/src/main/java/software/xdev/saveactions/processors/java/InspectionRunnable.java @@ -40,7 +40,7 @@ class InspectionRunnable implements Runnable this.project = project; this.psiFiles = psiFiles; this.toolWrapper = new LocalInspectionToolWrapper(inspectionTool); - LOGGER.info(String.format("Running inspection for %s", inspectionTool.getShortName())); + LOGGER.info(String.format("Running inspection for %s - %s", inspectionTool.getShortName(), project.getName())); } @Override