Merge branch 'dev-logger' into dev

pom.xml

@@ -17,6 +17,8 @@
         <java.version>1.8</java.version>
         <spring.version>4.3.7.RELEASE</spring.version>
         <jetty.version>9.4.0.v20161208</jetty.version>
+        <slf4j.version>1.7.21</slf4j.version>
+        <log4j.version>2.5</log4j.version>
     </properties>
 
     <groupId>ru.dmitriymx</groupId>
@@ -24,11 +26,41 @@
     <version>2.0.10-SNAPSHOT</version>
 
     <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>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- SPRING -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -80,6 +112,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- TESTING -->

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);
         }
     }
 

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);
         }
     }
 }

src/main/resources/log4j2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d] %5level - %30.30logger{1.} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>