forked from awslabs/amazon-kinesis-agent
-
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.
switch log4j from 1.2.x to 2.12.1, aws sdk from 1.11.28 to 1.11.700, …
…jackson from 2.8.x to 2.10.3
- Loading branch information
Marat Khusainov
committed
Apr 16, 2020
1 parent
93dd074
commit fef5145
Showing
8 changed files
with
76 additions
and
160 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
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
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
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
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
51 changes: 0 additions & 51 deletions
51
src/com/amazon/kinesis/streaming/agent/CustomLog4jFallbackErrorHandler.java
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
src/com/amazon/kinesis/streaming/agent/CustomLog4jFallbackPatterLayout.java
This file was deleted.
Oops, something went wrong.
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,65 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> | ||
|
|
||
| <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> | ||
| <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> | ||
| <errorHandler class="com.amazon.kinesis.streaming.agent.CustomLog4jFallbackErrorHandler"> | ||
| <root-ref /> | ||
| <appender-ref ref="FALLBACK" /> | ||
| </errorHandler> | ||
| <param name="File" value="/var/log/aws-kinesis-agent/aws-kinesis-agent.log" /> | ||
| <param name="Encoding" value="UTF-8" /> | ||
| <param name="MaxBackupIndex" value="5" /> | ||
| <param name="MaxFileSize" value="10485760" /> | ||
| <param name="Append" value="true" /> | ||
| <layout class="org.apache.log4j.PatternLayout"> | ||
| <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </layout> | ||
| </appender> | ||
| <appender name="FALLBACK" class="org.apache.log4j.RollingFileAppender"> | ||
| <param name="File" value="/tmp/fallback-aws-kinesis-agent.log" /> | ||
| <param name="Encoding" value="UTF-8" /> | ||
| <param name="MaxBackupIndex" value="2" /> | ||
| <param name="MaxFileSize" value="2097152" /> | ||
| <param name="Append" value="true" /> | ||
| <layout class="com.amazon.kinesis.streaming.agent.CustomLog4jFallbackPatterLayout"> | ||
| <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </layout> | ||
| </appender> | ||
| <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> | ||
| <param name="Target" value="System.out" /> | ||
| <param name="Encoding" value="UTF-8" /> | ||
| <layout class="org.apache.log4j.PatternLayout"> | ||
| <param name="ConversionPattern" value="LOG: %d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </layout> | ||
| </appender> | ||
|
|
||
| <logger name="com.amazon.kinesis.streaming.agent.metrics.CWPublisherRunnable"> | ||
| <level value="WARN" /> | ||
| </logger> | ||
|
|
||
| <logger name="com.amazonaws.auth.AWS4Signer"> | ||
| <level value="INFO" /> | ||
| </logger> | ||
|
|
||
| <logger name="com.amazonaws.http"> | ||
| <level value="INFO" /> | ||
| </logger> | ||
|
|
||
| <logger name="com.amazonaws.internal"> | ||
| <level value="INFO" /> | ||
| </logger> | ||
|
|
||
| <logger name="com.amazonaws.request"> | ||
| <level value="INFO" /> | ||
| </logger> | ||
|
|
||
| <logger name="org.apache.http"> | ||
| <level value="INFO" /> | ||
| </logger> | ||
|
|
||
| <root> | ||
| <level value="INFO" /> | ||
| <appender-ref ref="FILE" /> | ||
| </root> | ||
| </log4j:configuration> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Configuration> | ||
| <Appenders> | ||
| <File name="FILE" fileName="/var/log/aws-kinesis-agent/aws-kinesis-agent.log" append="true"> | ||
| <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </File> | ||
| <File name="FALLBACK" fileName="/tmp/fallback-aws-kinesis-agent.log" append="true"> | ||
| <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </File> | ||
| <Console name="STDOUT" target="SYSTEM_OUT"> | ||
| <PatternLayout pattern="LOG: %d{yyyy-MM-dd HH:mm:ss.SSSZ} %X{hostname} (%t) %c [%p] %m%n" /> | ||
| </Console> | ||
| <Failover name="Failover" primary="FILE"> | ||
| <Failovers> | ||
| <AppenderRef ref="FALLBACK"/> | ||
| </Failovers> | ||
| </Failover> | ||
| </Appenders> | ||
| <Loggers> | ||
| <Logger name="com.amazon.kinesis.streaming.agent.metrics.CWPublisherRunnable" level="info"> </Logger> | ||
| <Logger name="com.amazonaws.auth.AWS4Signer" level="info"> </Logger> | ||
| <Logger name="com.amazonaws.http" level="info"> </Logger> | ||
| <Logger name="com.amazonaws.internal" level="info"> </Logger> | ||
| <Logger name="com.amazonaws.request" level="info"> </Logger> | ||
| <Logger name="org.apache.http" level="info"> </Logger> | ||
| <Root level="info"> | ||
| <AppenderRef ref="FILE"/> | ||
| </Root> | ||
| </Loggers> | ||
| </Configuration> |