Skip to content

Commit 7581562

Browse files
committed
Ratpack 1.3.3, Gradle 2.14, Kotlin 1.0.2-1 and async log4j logging
1 parent 4cbcd4e commit 7581562

File tree

7 files changed

+67
-29
lines changed

7 files changed

+67
-29
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/.idea
44
*.ipr
55
*.iml
6-
*.iws
6+
*.iws
7+
*.log

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath "io.ratpack:ratpack-gradle:1.2.0",
8+
classpath "io.ratpack:ratpack-gradle:1.3.3",
99
"com.github.jengelman.gradle.plugins:shadow:1.2.3",
10-
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.1-2"
10+
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.2-1"
1111
}
1212
}
1313

@@ -27,6 +27,10 @@ repositories {
2727
dependencies {
2828
compile "org.jetbrains.kotlin:kotlin-stdlib:1.0.+"
2929
compile ratpack.dependency("guice")
30+
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.6.1'
31+
runtime 'org.apache.logging.log4j:log4j-api:2.6.1'
32+
runtime 'org.apache.logging.log4j:log4j-core:2.6.1'
33+
runtime 'com.lmax:disruptor:3.3.4'
3034
testCompile "junit:junit:4.+"
3135
testCompile "org.jetbrains.kotlin:kotlin-test:1.0.+"
3236
}

gradle/wrapper/gradle-wrapper.jar

-320 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Apr 04 18:03:11 CEST 2016
1+
#Wed Jun 22 22:14:02 BST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,30 @@
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

gradlew.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

src/main/resources/log4j2.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<!-- Async Loggers will auto-flush in batches, so switch off immediateFlush. -->
5+
<RollingRandomAccessFile name="RollingRandomAccessFile" fileName="app.log" immediateFlush="false"
6+
filePattern="app-%d{MM-dd-yyyy}-%i.log.gz">
7+
<PatternLayout>
8+
<Pattern>%d %p %c{1.} [%t] %m %ex%n</Pattern>
9+
</PatternLayout>
10+
<Policies>
11+
<TimeBasedTriggeringPolicy />
12+
<SizeBasedTriggeringPolicy size="500 KB"/>
13+
</Policies>
14+
<DefaultRolloverStrategy max="1"/>
15+
</RollingRandomAccessFile>
16+
17+
<Console name="STDOUT" target="SYSTEM_OUT">
18+
<PatternLayout>
19+
<Pattern>%d %p %c{1.} [%t] %m %ex%n</Pattern>
20+
</PatternLayout>
21+
</Console>
22+
</Appenders>
23+
<Loggers>
24+
<AsyncRoot level="info" includeLocation="false">
25+
<AppenderRef ref="STDOUT"/>
26+
<AppenderRef ref="RollingRandomAccessFile"/>
27+
</AsyncRoot>
28+
</Loggers>
29+
</Configuration>

0 commit comments

Comments
 (0)