diff --git a/backend-service/build.gradle b/backend-service/build.gradle index 57f8d5934a..a87f4f6be6 100644 --- a/backend-service/build.gradle +++ b/backend-service/build.gradle @@ -50,6 +50,15 @@ dependencies{ provided project(":metadata-etl") } +configurations { + all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + all*.exclude group: 'log4j', module: 'log4j' +} + +clean { + delete "lib/" +} + task copyPlayLibs(type: Copy){ from configurations.provided into 'lib' diff --git a/metadata-etl/src/main/resources/log4j.properties b/metadata-etl/src/main/resources/log4j.properties deleted file mode 100644 index 3b0b9122e5..0000000000 --- a/metadata-etl/src/main/resources/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2015 LinkedIn Corp. All rights reserved. -# -# 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. -# - -# Root logger option -log4j.rootLogger=INFO, file - -# Redirect log messages to console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - -# Redirect log messages to a log file, support file rolling. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=/var/tmp/wherehows/wherehows.log -log4j.appender.file.MaxFileSize=5MB -log4j.appender.file.MaxBackupIndex=10 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - - -log4j.logger.com.jayway.jsonpath=WARN -log4j.logger.org.apache=WARN \ No newline at end of file diff --git a/metadata-etl/src/main/resources/logback.xml b/metadata-etl/src/main/resources/logback.xml new file mode 100644 index 0000000000..d9850517e6 --- /dev/null +++ b/metadata-etl/src/main/resources/logback.xml @@ -0,0 +1,45 @@ + + + + + System.out + + %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n + + + + + /var/tmp/wherehows/wherehows.log + + %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n + + + 10 + /var/tmp/wherehows/wherehows.log.%i + + + 5MB + + + + + + + + + + diff --git a/web/build.gradle b/web/build.gradle index 28bab9b3d3..2f6a81c2fb 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -60,6 +60,15 @@ dependencies{ // playManaged files('target/scala-2.9.1/classes_managed') } +configurations { + all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12' + all*.exclude group: 'log4j', module: 'log4j' +} + +clean { + delete "lib/" +} + task copyPlayLibs(type: Copy){ from configurations.provided into 'lib'