refactor: Close logger on init & template commands

jreleaser · Nov 30, 2022 · ebd17cb · ebd17cb
1 parent 3018630
commit ebd17cb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/plugins/jreleaser-ant-tasks/src/main/java/org/jreleaser/ant/tasks/JReleaserInitTask.java b/plugins/jreleaser-ant-tasks/src/main/java/org/jreleaser/ant/tasks/JReleaserInitTask.java
@@ -89,6 +89,8 @@ public void execute() throws BuildException {
         } catch (IllegalStateException | IOException e) {
             logger.trace(e);
             throw new JReleaserException("Unexpected error", e);
+        } finally {
+            if (logger != null) logger.close();
         }
     }
 

diff --git a/plugins/jreleaser-ant-tasks/src/main/java/org/jreleaser/ant/tasks/JReleaserTemplateTask.java b/plugins/jreleaser-ant-tasks/src/main/java/org/jreleaser/ant/tasks/JReleaserTemplateTask.java
@@ -115,6 +115,8 @@ public void execute() throws BuildException {
         } catch (TemplateGenerationException e) {
             logger.trace(e);
             throw new JReleaserException("Unexpected error", e);
+        } finally {
+            if (logger != null) logger.close();
         }
     }
 

diff --git a/...dle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/tasks/JReleaserTemplateTask.groovy b/...dle-plugin/src/main/groovy/org/jreleaser/gradle/plugin/tasks/JReleaserTemplateTask.groovy
@@ -132,22 +132,26 @@ abstract class JReleaserTemplateTask extends DefaultTask {
 
     @TaskAction
     void generateTemplate() {
-        Path output = TemplateGenerator.builder()
-            .logger(jlogger.get())
-            .distributionName(distributionName.orNull)
-            .distributionType(distributionType.orNull)
-            .packagerName(packagerName.orNull)
-            .announcerName(announcerName.orNull)
-            .assemblerType(assemblerType.orNull)
-            .assemblerName(distributionName.orNull)
-            .outputDirectory(outputDirectory.get().asFile.toPath())
-            .overwrite(overwrite.get())
-            .snapshot(snapshot.get())
-            .build()
-            .generate()
-
-        if (output) {
-            logger.info('Template generated at {}', output.toAbsolutePath())
+        try {
+            Path output = TemplateGenerator.builder()
+                .logger(jlogger.get())
+                .distributionName(distributionName.orNull)
+                .distributionType(distributionType.orNull)
+                .packagerName(packagerName.orNull)
+                .announcerName(announcerName.orNull)
+                .assemblerType(assemblerType.orNull)
+                .assemblerName(distributionName.orNull)
+                .outputDirectory(outputDirectory.get().asFile.toPath())
+                .overwrite(overwrite.get())
+                .snapshot(snapshot.get())
+                .build()
+                .generate()
+
+            if (output) {
+                logger.info('Template generated at {}', output.toAbsolutePath())
+            }
+        } finally {
+            jlogger.get().close()
         }
     }
 }
diff --git a/...releaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/JReleaserTemplateMojo.java b/...releaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/JReleaserTemplateMojo.java
@@ -132,6 +132,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
         } catch (TemplateGenerationException e) {
             throw new MojoExecutionException("Unexpected error", e);
+        } finally {
+            getLogger().close();
         }
     }
 

diff --git a/plugins/jreleaser/src/main/java/org/jreleaser/cli/Init.java b/plugins/jreleaser/src/main/java/org/jreleaser/cli/Init.java
@@ -103,6 +103,8 @@ protected void execute() {
             }
         } catch (IllegalStateException | IOException e) {
             throw new JReleaserException($("ERROR_unexpected_error"), e);
+        } finally {
+            if (logger != null) logger.close();
         }
     }
 

diff --git a/plugins/jreleaser/src/main/java/org/jreleaser/cli/Template.java b/plugins/jreleaser/src/main/java/org/jreleaser/cli/Template.java
@@ -155,6 +155,8 @@ protected void execute() {
             }
         } catch (TemplateGenerationException e) {
             throw new JReleaserException($("ERROR_unexpected_error"), e);
+        } finally {
+            if (logger != null) logger.close();
         }
     }