Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

use slf4j instead of java.util.logging

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-10-16 11:03:54 +02:00
parent fd86fd5d76
commit 30f94d48ae
17 changed files with 185 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java
View File

@@ -9,6 +9,9 @@ package sonia.scm.web.cgi;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -21,8 +24,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.util.Enumeration;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -41,8 +42,7 @@ public class CGIRunner
public static final int BUFFERSIZE = 2 * 8192;
/** Field description */
private static final Logger logger =
Logger.getLogger(CGIRunner.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CGIRunner.class);
//~--- constructors ---------------------------------------------------------
@@ -51,12 +51,11 @@ public class CGIRunner
*
*
* @param context
* @param environment
* @param cmdPrefix
* @param ignoreExitState
*/
public CGIRunner(ServletContext context,
String cmdPrefix, boolean ignoreExitState)
public CGIRunner(ServletContext context, String cmdPrefix,
boolean ignoreExitState)
{
this.context = context;
this.cmdPrefix = cmdPrefix;
@@ -69,6 +68,8 @@ public class CGIRunner
* Method description
*
*
*
* @param environment
* @param command
* @param pathInfo
* @param req
@@ -76,8 +77,8 @@ public class CGIRunner
*
* @throws IOException
*/
public void exec(EnvList environment, File command, String pathInfo, HttpServletRequest req,
HttpServletResponse res)
public void exec(EnvList environment, File command, String pathInfo,
HttpServletRequest req, HttpServletResponse res)
throws IOException
{
String path = command.getAbsolutePath();
@@ -142,8 +143,8 @@ public class CGIRunner
// these extra ones were from printenv on www.dev.nomura.co.uk
environment.set("HTTPS", (req.isSecure()
? "ON"
: "OFF"));
? "ON"
: "OFF"));
// "DOCUMENT_ROOT" => root + "/docs",
// "SERVER_URL" => "NYI - http://us0245",
@@ -163,14 +164,15 @@ public class CGIRunner
execCmd = cmdPrefix + " " + execCmd;
}
if (logger.isLoggable(Level.FINE))
if (logger.isInfoEnabled())
{
logger.fine("execute cgi: ".concat(execCmd));
logger.info("execute cgi: ".concat(execCmd));
}
Process p = (dir == null)
? Runtime.getRuntime().exec(execCmd, environment.getEnvArray())
: Runtime.getRuntime().exec(execCmd, environment.getEnvArray(), dir);
: Runtime.getRuntime().exec(execCmd, environment.getEnvArray(),
dir);
// hook processes input to browser's output (async)
final InputStream inFromReq = req.getInputStream();
@@ -194,9 +196,9 @@ public class CGIRunner
outToCgi.close();
}
catch (IOException e)
catch (IOException ex)
{
logger.log(Level.FINEST, null, e);
logger.debug(ex.getMessage(), ex);
}
finally
{
@@ -266,7 +268,7 @@ public class CGIRunner
StringBuilder msg = new StringBuilder("Non-zero exit status (");
msg.append(exitValue).append(") from CGI program: ").append(path);
logger.warning(msg.toString());
logger.warn(msg.toString());
if (!res.isCommitted())
{
@@ -280,11 +282,11 @@ public class CGIRunner
// browser has probably closed its input stream - we
// terminate and clean up...
logger.finest("CGI: Client closed connection!");
logger.debug("CGI: Client closed connection!");
}
catch (InterruptedException ie)
{
logger.finest("CGI: interrupted!");
logger.debug("CGI: interrupted!");
}
finally
{

52
scm-web-api/src/main/java/sonia/scm/web/filter/LoggingFilter.java
View File

@@ -10,6 +10,10 @@ package sonia.scm.web.filter;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -23,8 +27,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -45,7 +47,7 @@ public class LoggingFilter extends HttpFilter
/** Field description */
private static final Logger logger =
Logger.getLogger(LoggingFilter.class.getName());
LoggerFactory.getLogger(LoggingFilter.class);
//~--- methods --------------------------------------------------------------
@@ -65,7 +67,7 @@ public class LoggingFilter extends HttpFilter
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
if (logger.isLoggable(Level.FINEST))
if (logger.isDebugEnabled())
{
LoggingHttpServletRequest loggingRequest =
new LoggingHttpServletRequest(request);
@@ -90,16 +92,16 @@ public class LoggingFilter extends HttpFilter
*/
private void logRequest(LoggingHttpServletRequest request)
{
logger.finest("**************** request ****************");
logger.finest("Info: Request-Uri = ".concat(request.getRequestURI()));
logger.finest("Info: Remote-Addr = ".concat(request.getRemoteAddr()));
logger.finest(
logger.debug("**************** request ****************");
logger.debug("Info: Request-Uri = ".concat(request.getRequestURI()));
logger.debug("Info: Remote-Addr = ".concat(request.getRemoteAddr()));
logger.debug(
"Info: Content-Size = ".concat(
Integer.toString(request.getContentLength())));
logger.finest(
logger.debug(
"Info: Content-Type = ".concat(Util.nonNull(request.getContentType())));
logger.finest("Info: Method = ".concat(request.getMethod()));
logger.finest(
logger.debug("Info: Method = ".concat(request.getMethod()));
logger.debug(
"Info: AuthType = ".concat(Util.nonNull(request.getAuthType())));
Enumeration headers = request.getHeaderNames();
@@ -108,7 +110,7 @@ public class LoggingFilter extends HttpFilter
{
String header = (String) headers.nextElement();
logger.finest(
logger.debug(
"Header: ".concat(header).concat(" = ").concat(
request.getHeader(header)));
}
@@ -119,7 +121,7 @@ public class LoggingFilter extends HttpFilter
{
for (Cookie cookie : cookies)
{
logger.finest(
logger.debug(
"Cookie: ".concat(cookie.getName()).concat(" = ").concat(
cookie.getValue()));
}
@@ -133,7 +135,7 @@ public class LoggingFilter extends HttpFilter
{
String parameter = (String) parameters.nextElement();
logger.finest(
logger.debug(
"Parameter: ".concat(parameter).concat(" = ").concat(
request.getParameter(parameter)));
}
@@ -147,7 +149,7 @@ public class LoggingFilter extends HttpFilter
{
String attribute = (String) attributes.nextElement();
logger.finest(
logger.debug(
"Attribute: ".concat(attribute).concat(" = ").concat(
request.getAttribute(attribute).toString()));
}
@@ -155,7 +157,7 @@ public class LoggingFilter extends HttpFilter
HttpSession session = request.getSession(true);
logger.finest("Session-New: ".concat(Boolean.toString(session.isNew())));
logger.debug("Session-New: ".concat(Boolean.toString(session.isNew())));
Enumeration sAttributes = session.getAttributeNames();
@@ -165,7 +167,7 @@ public class LoggingFilter extends HttpFilter
{
String sAttribute = (String) sAttributes.nextElement();
logger.finest(
logger.debug(
"Session-Attribute: ".concat(sAttribute).concat(" = ").concat(
request.getSession().getAttribute(sAttribute).toString()));
}
@@ -180,29 +182,29 @@ public class LoggingFilter extends HttpFilter
*/
private void logResponse(LoggingHttpServletResponse response)
{
logger.finest("**************** response ****************");
logger.finest(
logger.debug("**************** response ****************");
logger.debug(
"status code = ".concat(Integer.toString(response.getStatusCode())));
logger.finest(
logger.debug(
"status message = ".concat(Util.nonNull(response.getStatusMessage())));
logger.finest(
logger.debug(
"charset = ".concat(Util.nonNull(response.getCharacterEncoding())));
logger.finest(
logger.debug(
"content-type = ".concat(Util.nonNull(response.getContentType())));
logger.finest(
logger.debug(
"content-length = ".concat(
Integer.toString(response.getContentLength())));
for (Cookie cookie : response.getCookies())
{
logger.finest(
logger.debug(
"Cookie: ".concat(cookie.getName()).concat(" = ").concat(
cookie.getValue()));
}
for (Entry<String, String> header : response.getHeaders().entrySet())
{
logger.finest(
logger.debug(
"Header: ".concat(header.getKey()).concat(" = ").concat(
header.getValue()));
}