From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
src/com/gitblit/utils/ClientLogger.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/utils/ClientLogger.java b/src/com/gitblit/utils/ClientLogger.java
index 2e16fd1..7d18f3d 100644
--- a/src/com/gitblit/utils/ClientLogger.java
+++ b/src/com/gitblit/utils/ClientLogger.java
@@ -1,32 +1,77 @@
+/*
+ * Copyright 2012 John Crygier
+ * Copyright 2012 gitblit.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
import org.eclipse.jgit.transport.ReceivePack;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Class to log messages to the pushing client. Intended to be used by
- * the Groovy Hooks.
+ * Class to log messages to the pushing Git client. Intended to be used by the
+ * Groovy Hooks.
*
- * @author jcrygier
- *
+ * @author John Crygier
+ *
*/
public class ClientLogger {
-
- static final Logger logger = LoggerFactory.getLogger(ClientLogger.class);
+
+ static final Logger logger = LoggerFactory.getLogger(ClientLogger.class);
private ReceivePack rp;
-
+
public ClientLogger(ReceivePack rp) {
this.rp = rp;
}
-
+
/**
- * Sends a message to the git client. Useful for sending INFO / WARNING messages.
+ * Sends an info/warning message to the git client.
*
* @param message
*/
- public void sendMessage(String message) {
+ public void info(String message) {
rp.sendMessage(message);
}
-
+
+ /**
+ * Sends an error message to the git client.
+ *
+ * @param message
+ */
+ public void error(String message) {
+ rp.sendError(message);
+ }
+
+ /**
+ * Sends an error message to the git client with an exception.
+ *
+ * @param message
+ * @param t
+ * an exception
+ */
+ public void error(String message, Throwable t) {
+ PrintWriter writer = new PrintWriter(new StringWriter());
+ if (!StringUtils.isEmpty(message)) {
+ writer.append(message);
+ writer.append('\n');
+ }
+ t.printStackTrace(writer);
+ rp.sendError(writer.toString());
+ }
+
}
--
Gitblit v1.9.1