Cleaned up the logger

Author: intisy

src/main/java/io/github/intisy/gradle/github/GithubExtension.java

@@ -10,9 +10,10 @@
  */
 @SuppressWarnings("unused")
 public class GithubExtension {
+    private final ResourcesExtension resources = new ResourcesExtension();
+
     private String accessToken;
     private boolean debug;
-    private final ResourcesExtension resources = new ResourcesExtension();
 
     /**
      * @param debug Whether to enable debug logging.

src/main/java/io/github/intisy/gradle/github/Logger.java

@@ -1,22 +1,24 @@
 package io.github.intisy.gradle.github;
 
 import org.gradle.api.Project;
+import org.gradle.api.logging.LogLevel;
+import org.gradle.api.logging.Logging;
 
 /**
  * A logger for the GitHub plugin.
  */
 public class Logger {
-    private static final String PREFIX = "[GitHub] ";
     private final GithubExtension extension;
-    private final org.gradle.api.logging.Logger gradleLogger;
+    private final org.gradle.api.logging.Logger logger;
+    private Project project;
 
     /**
      * Creates a new logger.
      * @param extension The GitHub extension.
      */
     public Logger(GithubExtension extension) {
         this.extension = extension;
-        this.gradleLogger = org.gradle.api.logging.Logging.getLogger(Logger.class);
+        this.logger = Logging.getLogger(Logger.class);
     }
 
     /**
@@ -37,23 +39,24 @@ public Logger(GithubExtension extension, Project project) {
             throw new NullPointerException("extension and project cannot be null");
         }
         this.extension = extension;
-        this.gradleLogger = project.getLogger();
+        this.logger = project.getLogger();
+        this.project = project;
     }
 
     /**
      * Logs a standard lifecycle message, visible in the default Gradle output.
      * @param message The message to log.
      */
     public void log(String message) {
-        gradleLogger.lifecycle(PREFIX + message);
+        logger.lifecycle(message);
     }
 
     /**
      * Logs an error message.
      * @param message The message to log.
      */
     public void error(String message) {
-        gradleLogger.error(PREFIX + message);
+        logger.error(message);
     }
 
     /**
@@ -62,7 +65,7 @@ public void error(String message) {
      * @param throwable The exception to log.
      */
     public void error(String message, Throwable throwable) {
-        gradleLogger.error(PREFIX + message, throwable);
+        logger.error(message, throwable);
     }
 
     /**
@@ -74,10 +77,9 @@ public void error(String message, Throwable throwable) {
      * @param message The message to log.
      */
     public void debug(String message) {
-        if (extension == null || extension.isDebug()) {
-            gradleLogger.lifecycle(PREFIX + "[DEBUG] " + message);
-        } else {
-            gradleLogger.debug(PREFIX + message);
+        LogLevel logLevel;
+        if (extension.isDebug() || project != null && ((logLevel = project.getGradle().getStartParameter().getLogLevel()).equals(LogLevel.INFO) || logLevel.equals(LogLevel.DEBUG))) {
+            logger.lifecycle(message);
         }
     }
 
@@ -86,6 +88,6 @@ public void debug(String message) {
      * @param message The message to log.
      */
     public void warn(String message) {
-        gradleLogger.warn(PREFIX + message);
+        logger.warn(message);
     }
 }