forked from playframework/play1
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
playframework#1367 fix carriage return
- Loading branch information
Showing
2 changed files
with
40 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| # appender Console | ||
| appender.console.type = Console | ||
| appender.console.name = STDOUT | ||
| appender.console.layout.type = PatternLayout | ||
| appender.console.layout.pattern = %d [%t] %p %c - %m%n | ||
| appender.console.filter.threshold.type = ThresholdFilter | ||
| appender.console.filter.threshold.level = INFO | ||
| # play logger | ||
| logger.app.name = play | ||
| logger.app.level = INFO | ||
| # play logger | ||
| logger.custom.name = logtest.properties | ||
| logger.custom.level = WARN | ||
| # root logger | ||
| rootLogger.level = DEBUG | ||
| rootLogger.appenderRef.console.ref = STDOUT | ||
| # appender Console | ||
| appender.console.type = Console | ||
| appender.console.name = STDOUT | ||
| appender.console.layout.type = PatternLayout | ||
| appender.console.layout.pattern = %d [%t] %p %c - %m%n | ||
| appender.console.filter.threshold.type = ThresholdFilter | ||
| appender.console.filter.threshold.level = INFO | ||
| # play logger | ||
| logger.app.name = play | ||
| logger.app.level = INFO | ||
| # play logger | ||
| logger.custom.name = logtest.properties | ||
| logger.custom.level = WARN | ||
| # root logger | ||
| rootLogger.level = DEBUG | ||
| rootLogger.appenderRef.console.ref = STDOUT | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| <Configuration name="ConfigTest" status="ERROR" monitorInterval="5"> | ||
| <Appenders> | ||
|
|
||
| <SystemPropertyArbiter propertyName="env" propertyValue="dev"> | ||
| <Console name="Out"> | ||
| <PatternLayout pattern="%m%n"/> | ||
| </Console> | ||
| </SystemPropertyArbiter> | ||
| <SystemPropertyArbiter propertyName="env" propertyValue="prod"> | ||
| <List name="Out"> | ||
| </List> | ||
| </SystemPropertyArbiter> | ||
|
|
||
| </Appenders> | ||
| <Loggers> | ||
| <Logger name="logtest.xml" level="trace" > | ||
| <AppenderRef ref="Out"/> | ||
| </Logger> | ||
| <Root level="debug"> | ||
| <AppenderRef ref="Out"/> | ||
| </Root> | ||
| </Loggers> | ||
| </Configuration> | ||
| <Configuration name="ConfigTest" status="ERROR" monitorInterval="5"> | ||
| <Appenders> | ||
|
|
||
| <SystemPropertyArbiter propertyName="env" propertyValue="dev"> | ||
| <Console name="Out"> | ||
| <PatternLayout pattern="%m%n"/> | ||
| </Console> | ||
| </SystemPropertyArbiter> | ||
| <SystemPropertyArbiter propertyName="env" propertyValue="prod"> | ||
| <List name="Out"> | ||
| </List> | ||
| </SystemPropertyArbiter> | ||
|
|
||
| </Appenders> | ||
| <Loggers> | ||
| <Logger name="logtest.xml" level="trace" > | ||
| <AppenderRef ref="Out"/> | ||
| </Logger> | ||
| <Root level="debug"> | ||
| <AppenderRef ref="Out"/> | ||
| </Root> | ||
| </Loggers> | ||
| </Configuration> |