diff --git a/pom.xml b/pom.xml index 81b9404..995d6ca 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ 1.8 4.3.7.RELEASE 9.4.0.v20161208 + 1.7.21 ru.dmitriymx @@ -24,6 +25,18 @@ 2.0.10-SNAPSHOT + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + org.springframework diff --git a/src/main/java/kinosearch/webapp/WebApp.java b/src/main/java/kinosearch/webapp/WebApp.java index d85c7a3..0086a5d 100644 --- a/src/main/java/kinosearch/webapp/WebApp.java +++ b/src/main/java/kinosearch/webapp/WebApp.java @@ -7,17 +7,19 @@ package kinosearch.webapp; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Slf4jLog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; import java.net.InetSocketAddress; -import java.util.logging.Level; -import java.util.logging.Logger; public class WebApp { - private final Logger logger = Logger.getLogger(WebApp.class.getName()); + private final Logger logger = LoggerFactory.getLogger(WebApp.class); private final String host; private final int port; @@ -27,13 +29,14 @@ public class WebApp { } void start() { + Log.setLog(new Slf4jLog("Jetty.Logger")); Server server = new Server(new InetSocketAddress(host, port)); server.setHandler(getServletContextHandler(getContext())); try { server.start(); server.join(); } catch (Exception e) { - logger.log(Level.SEVERE, "Start server", e); + logger.error("Start server", e); } } diff --git a/src/main/java/kinosearch/webapp/WebAppController.java b/src/main/java/kinosearch/webapp/WebAppController.java index 8b71849..1d01de1 100644 --- a/src/main/java/kinosearch/webapp/WebAppController.java +++ b/src/main/java/kinosearch/webapp/WebAppController.java @@ -9,6 +9,8 @@ import kinosearch.core.Kino; import kinosearch.core.KinoPlay; import kinosearch.core.Tools; import kinosearch.core.warez.KinoWarez; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Controller; @@ -27,12 +29,10 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; @Controller public class WebAppController { - private final Logger logger = Logger.getLogger(WebAppController.class.getName()); + private final Logger logger = LoggerFactory.getLogger(WebAppController.class); @Autowired private ApplicationContext coreContext; @@ -180,7 +180,7 @@ public class WebAppController { con.disconnect(); connected = false; _try++; - logger.log(Level.WARNING,String.format("Error connection to '%s': '%s'. Try again...", url.toString(), e.getMessage())); + logger.warn("Error connection to '{}': '{}'. Try again...", url.toString(), e.getMessage()); } } while (!connected && _try < 3); @@ -232,7 +232,7 @@ public class WebAppController { try { response.sendError(404); } catch (IOException e) { - logger.log(Level.WARNING, "favicon 404", e); + logger.warn("favicon 404", e); } } }