0

добавляем SLF4j API

This commit is contained in:
2017-12-18 00:46:02 +03:00
parent b5b14e0fff
commit 20da987a48
3 changed files with 25 additions and 9 deletions

13
pom.xml
View File

@@ -17,6 +17,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring.version>4.3.7.RELEASE</spring.version> <spring.version>4.3.7.RELEASE</spring.version>
<jetty.version>9.4.0.v20161208</jetty.version> <jetty.version>9.4.0.v20161208</jetty.version>
<slf4j.version>1.7.21</slf4j.version>
</properties> </properties>
<groupId>ru.dmitriymx</groupId> <groupId>ru.dmitriymx</groupId>
@@ -24,6 +25,18 @@
<version>2.0.10-SNAPSHOT</version> <version>2.0.10-SNAPSHOT</version>
<dependencies> <dependencies>
<!-- LOGGER -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- SPRING --> <!-- SPRING -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>

View File

@@ -7,17 +7,19 @@ package kinosearch.webapp;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder; 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.ContextLoaderListener;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.logging.Level;
import java.util.logging.Logger;
public class WebApp { 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 String host;
private final int port; private final int port;
@@ -27,13 +29,14 @@ public class WebApp {
} }
void start() { void start() {
Log.setLog(new Slf4jLog("Jetty.Logger"));
Server server = new Server(new InetSocketAddress(host, port)); Server server = new Server(new InetSocketAddress(host, port));
server.setHandler(getServletContextHandler(getContext())); server.setHandler(getServletContextHandler(getContext()));
try { try {
server.start(); server.start();
server.join(); server.join();
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Start server", e); logger.error("Start server", e);
} }
} }

View File

@@ -9,6 +9,8 @@ import kinosearch.core.Kino;
import kinosearch.core.KinoPlay; import kinosearch.core.KinoPlay;
import kinosearch.core.Tools; import kinosearch.core.Tools;
import kinosearch.core.warez.KinoWarez; import kinosearch.core.warez.KinoWarez;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -27,12 +29,10 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.*; import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@Controller @Controller
public class WebAppController { public class WebAppController {
private final Logger logger = Logger.getLogger(WebAppController.class.getName()); private final Logger logger = LoggerFactory.getLogger(WebAppController.class);
@Autowired @Autowired
private ApplicationContext coreContext; private ApplicationContext coreContext;
@@ -180,7 +180,7 @@ public class WebAppController {
con.disconnect(); con.disconnect();
connected = false; connected = false;
_try++; _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); } while (!connected && _try < 3);
@@ -232,7 +232,7 @@ public class WebAppController {
try { try {
response.sendError(404); response.sendError(404);
} catch (IOException e) { } catch (IOException e) {
logger.log(Level.WARNING, "favicon 404", e); logger.warn("favicon 404", e);
} }
} }
} }