From 41b1a6584e57dce9f96805dfae28722a3a4ab406 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 24 May 2017 14:31:41 +0100
Subject: [PATCH] Add logging config for AWS sample

---
 .../spring-cloud-function-adapter-aws/pom.xml |  8 +++----
 .../pom.xml                                   | 20 ++++++++++++----
 .../src/main/resources/log4j.properties       | 23 +++++++++++++++++++
 3 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 spring-cloud-function-adapters/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
index 57b2ac90a..906375cba 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
@@ -38,14 +38,14 @@
 		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-events</artifactId>
-			<version>${aws-lambda-events.version}</version>
+			<artifactId>aws-lambda-java-log4j</artifactId>
+			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-log4j</artifactId>
-			<version>1.0.0</version>
+			<artifactId>aws-lambda-java-events</artifactId>
+			<version>${aws-lambda-events.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/pom.xml
index e916c244d..7100e1001 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/pom.xml
@@ -34,6 +34,17 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-adapter-aws</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j</artifactId>
+			<version>1.3.8.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -42,14 +53,13 @@
 		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-events</artifactId>
-			<version>${aws-lambda-events.version}</version>
-			<scope>provided</scope>
+			<artifactId>aws-lambda-java-log4j</artifactId>
+			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-log4j</artifactId>
-			<version>1.0.0</version>
+			<artifactId>aws-lambda-java-events</artifactId>
+			<version>${aws-lambda-events.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties b/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties
new file mode 100644
index 000000000..adee21bb8
--- /dev/null
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootCategory=INFO, LAMBDA
+
+PID=????
+LOG_LEVEL_PATTERN=%5p
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} ${LOG_LEVEL_PATTERN} [%t] --- %c{1}: %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.LAMBDA=com.amazonaws.services.lambda.runtime.log4j.LambdaAppender
+log4j.appender.LAMBDA.layout=org.apache.log4j.PatternLayout
+log4j.appender.LAMBDA.layout.conversionPattern=${LOG_PATTERN}
+
+log4j.category.org.apache.catalina.startup.DigesterFactory=ERROR
+log4j.category.org.apache.catalina.util.LifecycleBase=ERROR
+log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN
+log4j.category.org.apache.sshd.common.util.SecurityUtils
+log4j.category.org.apache.tomcat.util.net.NioSelectorPool=WARN
+log4j.category.org.crsh.plugin=WARN
+log4j.category.org.crsh.ssh=WARN
+log4j.category.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR
+log4j.category.org.hibernate.validator.internal.util.Version=WARN
+log4j.category.org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration=WARN
+log4j.category.org.springframework.boot.actuate.endpoint.jmx=WARN
+log4j.category.org.thymeleaf=WARN
\ No newline at end of file