From b083db56ac27b9d80b58e1e04deacc4414d5f5c4 Mon Sep 17 00:00:00 2001
From: Steven Cooney <steven.cooney@x-labsystems.co.uk>
Date: Thu, 30 May 2019 16:17:45 +0100
Subject: [PATCH] Add Logging Wrapper for Plugin

Add a wrapper to the logging commands to allow us to identify the plugin outputs
---
 .../phabricator-plugin-common/pom.xml         |  9 ++++++++
 .../phabricator/PhabricatorPluginLogger.java  | 22 +++++++++++++++++++
 .../PhabricatorPluginBuildFeature.java        | 13 +++++++----
 ...build-server-plugin-phabricator-plugin.xml |  3 ++-
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java

diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/pom.xml b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/pom.xml
index e13efa1..e384158 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/pom.xml
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/pom.xml
@@ -8,6 +8,15 @@
   </parent>
   <artifactId>phabricator-plugin-common</artifactId>
   <packaging>jar</packaging>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.teamcity</groupId>
+      <artifactId>common-api</artifactId>
+      <version>${teamcity-version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java
new file mode 100644
index 0000000..7df96e2
--- /dev/null
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginLogger.java
@@ -0,0 +1,22 @@
+package uk.xlab.teamcity.phabricator;
+
+import jetbrains.buildServer.log.Loggers;
+
+public final class PhabricatorPluginLogger {
+
+	public void serverInfo(String message) {
+        Loggers.SERVER.info(String.format("Phabricator Plugin: %s", message));
+    }
+
+    public void serverWarn(String message, Exception e) {
+        Loggers.SERVER.warn(message, e);
+    }
+
+    public void agentInfo(String message) {
+        Loggers.AGENT.info(String.format("Phabricator Plugin: %s", message));
+    }
+    
+    public void agentWarn(String message, Exception e) {
+        Loggers.AGENT.warn(String.format("Phabricator Plugin: %s", message), e);
+    }
+}
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginBuildFeature.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginBuildFeature.java
index 1c85455..58eceb7 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginBuildFeature.java
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginBuildFeature.java
@@ -4,17 +4,22 @@ import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
 
-import jetbrains.buildServer.log.Loggers;
 import jetbrains.buildServer.serverSide.BuildFeature;
 import jetbrains.buildServer.web.openapi.PluginDescriptor;
 
 public class PhabricatorPluginBuildFeature extends BuildFeature {
-	private final String myEditUrl;
 	
-	public PhabricatorPluginBuildFeature(@NotNull final PluginDescriptor pluginDescriptor) {
+	private final String myEditUrl;
+	private PhabricatorPluginLogger logger;
+	
+	public PhabricatorPluginBuildFeature(
+			@NotNull final PluginDescriptor pluginDescriptor,
+			@NotNull final PhabricatorPluginLogger logger
+	) {
 		myEditUrl = pluginDescriptor.getPluginResourcesPath("phabricatorBuildFeature.jsp");
+		this.logger = logger;
 		
-		Loggers.SERVER.info("Phabricator build feature registered");
+		this.logger.serverInfo("Build feature registered");
 	}
 	
 	@Override
diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/resources/META-INF/build-server-plugin-phabricator-plugin.xml b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/resources/META-INF/build-server-plugin-phabricator-plugin.xml
index f6033b1..df2dc83 100644
--- a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/resources/META-INF/build-server-plugin-phabricator-plugin.xml
+++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/resources/META-INF/build-server-plugin-phabricator-plugin.xml
@@ -4,5 +4,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-autowire="constructor">
        
-       <bean class="uk.xlab.teamcity.phabricator.PhabricatorPluginBuildFeature"></bean>
+       <bean class="uk.xlab.teamcity.phabricator.PhabricatorPluginBuildFeature" />
+       <bean class="uk.xlab.teamcity.phabricator.PhabricatorPluginLogger" />
 </beans>