You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by da...@apache.org on 2016/12/09 00:29:25 UTC
incubator-s2graph git commit: [S2GRAPH-138] fixed logging in Play!
development mode
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 3d965448f -> 7ea3b55e4
[S2GRAPH-138] fixed logging in Play! development mode
JIRA:
[S2GRAPH-138] https://issues.apache.org/jira/browse/S2GRAPH-138
Pull Request:
Closes #107
Author
Jong Wook Kim <jo...@nyu.edu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/7ea3b55e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/7ea3b55e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/7ea3b55e
Branch: refs/heads/master
Commit: 7ea3b55e43cfa59512f9204285dc5a0c217d5d1d
Parents: 3d96544
Author: Jong Wook Kim <jo...@nyu.edu>
Authored: Tue Dec 6 19:02:22 2016 -0500
Committer: daewon <da...@apache.org>
Committed: Fri Dec 9 09:22:25 2016 +0900
----------------------------------------------------------------------
.gitignore | 1 +
CHANGES | 3 +
build.sbt | 5 +-
s2rest_play/build.sbt | 2 +-
s2rest_play/conf/log4j.properties | 1 +
s2rest_play/conf/logger.xml | 103 ---------------------------------
6 files changed, 8 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4b2e63d..1f0f5b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
.cache
.history
.lib/
+var/*
dist/*
target/
lib_managed/
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ac26dfd..62ad03a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -132,6 +132,9 @@ Release 0.1.0 - unreleased
S2GRAPH-126: SBT error when there is no ~/.m2/settings.xml
(Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+ S2GRAPH-138: Fixed logging in Play! development mode
+ (Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+
TASKS
S2GRAPH-2: Update document and quick start environment to have recent set-up command changes.
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index dc15792..5c73076 100755
--- a/build.sbt
+++ b/build.sbt
@@ -33,9 +33,8 @@ lazy val commonSettings = Seq(
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
parallelExecution in Test := false,
libraryDependencies ++= Common.loggingRuntime,
- resolvers ++= Seq(
- Resolver.mavenLocal
- )
+ unmanagedClasspath in Runtime <+= (resourceDirectory in Compile).map(Attributed.blank),
+ resolvers += Resolver.mavenLocal
) ++ Publisher.defaultSettings
Revolver.settings
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/s2rest_play/build.sbt
----------------------------------------------------------------------
diff --git a/s2rest_play/build.sbt b/s2rest_play/build.sbt
index bab13cd..436295c 100644
--- a/s2rest_play/build.sbt
+++ b/s2rest_play/build.sbt
@@ -22,7 +22,7 @@ name := "s2rest_play"
scalacOptions in Test ++= Seq("-Yrangepos")
-libraryDependencies := (libraryDependencies.value ++ Seq(ws, filters, specs2 % Test)).map(_.excludeLogging()) ++ Seq(
+libraryDependencies ++= Seq(ws, filters, specs2 % Test).map(_.excludeLogging()) ++ Seq(
"com.google.guava" % "guava" % "12.0.1" force(), // use this old version of guava to avoid incompatibility
"io.netty" % "netty-all" % "4.0.40.Final" force()
//"org.specs2" %% "specs2-core" % specs2Version % "test"
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/s2rest_play/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/s2rest_play/conf/log4j.properties b/s2rest_play/conf/log4j.properties
new file mode 120000
index 0000000..41f51f3
--- /dev/null
+++ b/s2rest_play/conf/log4j.properties
@@ -0,0 +1 @@
+../../conf/log4j.properties
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7ea3b55e/s2rest_play/conf/logger.xml
----------------------------------------------------------------------
diff --git a/s2rest_play/conf/logger.xml b/s2rest_play/conf/logger.xml
deleted file mode 100644
index 0fe2b69..0000000
--- a/s2rest_play/conf/logger.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<configuration>
-
- <conversionRule conversionWord="coloredLevel" converterClass="play.api.Logger$ColoredLevel"/>
-
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>logs/application.log</file>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>logs/application.%i.log</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>500MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>%date [%level] [%logger] [%thread] - %message %xException%n</pattern>
- </encoder>
- </appender>
-
-
- <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>logs/error.log</file>
- <append>true</append>
- <encoder>
- <pattern>%date [%level] [%logger] [%thread] - %message %xException%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>logs/error.log.%d.%i</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>500MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <maxHistory>3</maxHistory>
- </rollingPolicy>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%coloredLevel %logger{15} - %message%n%xException%n</pattern>
- </encoder>
- </appender>
-
- <appender name="ACTOR" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>logs/actor.log</file>
- <append>true</append>
- <encoder>
- <pattern>%date [%level] [%logger] [%thread] - %message %xException%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>logs/actor.log.%d.%i</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>200MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <maxHistory>7</maxHistory>
- </rollingPolicy>
- </appender>
-
- <logger name="play" level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="application" level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="FILE"/>
- </logger>
-
- <logger name="error" level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="ERROR"/>
- </logger>
-
- <logger name="actor" level="INFO">
- <appender-ref ref="ACTOR"/>
- </logger>
-
- <logger name="akka" level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="FILE"/>
- </logger>
-
-</configuration>