From 2142bd1d8a32393477515aed8a8a78fcc8cc6d90 Mon Sep 17 00:00:00 2001 From: Andrius Dagys Date: Thu, 21 Jul 2016 13:55:40 +0100 Subject: [PATCH 1/3] Added Log4j bindings for SLF4J. Test log output is redirected to the console, and demo output is now additionally stored in a rolling log file. --- build.gradle | 12 ++++++- config/dev/log4j2.xml | 55 +++++++++++++++++++++++++++++++++ config/test/log4j2.xml | 17 ++++++++++ contracts/build.gradle | 8 +++++ contracts/isolated/build.gradle | 8 +++++ core/build.gradle | 15 +++++++-- node/build.gradle | 13 +++++++- 7 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 config/dev/log4j2.xml create mode 100644 config/test/log4j2.xml diff --git a/build.gradle b/build.gradle index 0f15cbaa33..60472fe83c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ buildscript { ext.jetty_version = '9.3.9.v20160517' ext.jersey_version = '2.23.1' ext.jolokia_version = '2.0.0-M1' - ext.slf4j_version = '1.7.21' ext.assertj_version = '3.5.1' + ext.log4j_version = '2.6.2' repositories { mavenCentral() @@ -63,6 +63,16 @@ sourceSets { srcDir file('src/integration-test/kotlin') } } + main { + resources { + srcDir "config/dev" + } + } + test { + resources { + srcDir "config/test" + } + } } //noinspection GroovyAssignabilityCheck diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml new file mode 100644 index 0000000000..961176e00d --- /dev/null +++ b/config/dev/log4j2.xml @@ -0,0 +1,55 @@ + + + + + logs + main + ${log-path}/archive + + + + + + + + + [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/test/log4j2.xml b/config/test/log4j2.xml new file mode 100644 index 0000000000..a6d2edd9d3 --- /dev/null +++ b/config/test/log4j2.xml @@ -0,0 +1,17 @@ + + + + + + + [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n + > + + + + + + + + + \ No newline at end of file diff --git a/contracts/build.gradle b/contracts/build.gradle index ae3daa7713..d83a41f277 100644 --- a/contracts/build.gradle +++ b/contracts/build.gradle @@ -80,4 +80,12 @@ dependencies { compile project(':core') testCompile 'junit:junit:4.12' +} + +sourceSets { + test { + resources { + srcDir "../config/test" + } + } } \ No newline at end of file diff --git a/contracts/isolated/build.gradle b/contracts/isolated/build.gradle index d9d9f852e4..6e4f0fe87a 100644 --- a/contracts/isolated/build.gradle +++ b/contracts/isolated/build.gradle @@ -78,4 +78,12 @@ repositories { dependencies { compile project(':core') +} + +sourceSets { + test { + resources { + srcDir "../../config/test" + } + } } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 33e81bafc6..3ed614af07 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -21,6 +21,14 @@ repositories { } } +sourceSets { + test { + resources { + srcDir "../config/test" + } + } +} + dependencies { testCompile 'junit:junit:4.12' testCompile "commons-fileupload:commons-fileupload:1.3.2" @@ -35,12 +43,13 @@ dependencies { // Thread safety annotations compile "com.google.code.findbugs:jsr305:3.0.1" + // Log4J: logging framework (wth SLF4J bindings) + compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" + compile "org.apache.logging.log4j:log4j-core:${log4j_version}" + // AssertJ: for fluent assertions for testing testCompile "org.assertj:assertj-core:${assertj_version}" - // SLF4J: Logging framework. - compile "org.slf4j:slf4j-jdk14:${slf4j_version}" - // Guava: Google utilities library. compile "com.google.guava:guava:19.0" diff --git a/node/build.gradle b/node/build.gradle index 8a289161b5..4da01a79b1 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -19,6 +19,14 @@ configurations { runtime.exclude module: 'isolated' } +sourceSets { + test { + resources { + srcDir "../config/test" + } + } +} + // To find potential version conflicts, run "gradle htmlDependencyReport" and then look in // build/reports/project/dependencies/index.html for green highlighted parts of the tree. @@ -26,7 +34,10 @@ dependencies { compile project(':contracts') compile "com.google.code.findbugs:jsr305:3.0.1" - compile "org.slf4j:slf4j-jdk14:${slf4j_version}" + + // Log4J: logging framework (wth SLF4J bindings) + compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" + compile "org.apache.logging.log4j:log4j-core:${log4j_version}" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" From e7ff5b8f6fda9ff8244100a29bc114e53065a19b Mon Sep 17 00:00:00 2001 From: Andrius Dagys Date: Fri, 22 Jul 2016 17:31:03 +0100 Subject: [PATCH 2/3] Typo fix --- core/build.gradle | 2 +- node/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 3ed614af07..d289d4c60c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -43,7 +43,7 @@ dependencies { // Thread safety annotations compile "com.google.code.findbugs:jsr305:3.0.1" - // Log4J: logging framework (wth SLF4J bindings) + // Log4J: logging framework (with SLF4J bindings) compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" compile "org.apache.logging.log4j:log4j-core:${log4j_version}" diff --git a/node/build.gradle b/node/build.gradle index 4da01a79b1..9d1ea59c8c 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -35,7 +35,7 @@ dependencies { compile "com.google.code.findbugs:jsr305:3.0.1" - // Log4J: logging framework (wth SLF4J bindings) + // Log4J: logging framework (with SLF4J bindings) compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" compile "org.apache.logging.log4j:log4j-core:${log4j_version}" From f807e157b6c3fd5e5a3f0836bb86b60e84f8d495 Mon Sep 17 00:00:00 2001 From: Andrius Dagys Date: Mon, 25 Jul 2016 18:07:50 +0100 Subject: [PATCH 3/3] Appended hostname to log filename. Logging date in ISO8601, GMT --- config/dev/log4j2.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml index 961176e00d..b1969e8c25 100644 --- a/config/dev/log4j2.xml +++ b/config/dev/log4j2.xml @@ -3,7 +3,7 @@ logs - main + node-${hostName} ${log-path}/archive @@ -24,7 +24,7 @@ fileName="${log-path}/${log-name}.log" filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz"> - +