Skip to content

Commit 49cecae

Browse files
JoaoJandreJoaoJandre
authored
Normalize loggers and upgrade log4j 1.2 to log4j 2.19 (#7131)
* Normalize logs All classes that could have their loggers inherited from their fathers had their own loggers deleted; Most loggers didn't have to be static, so most of them were normalized so that they wouldn't be; All loggers are protected now; Static logger's name are now 'LOGGER'; Non-static logger's name are now 'logger'; New class DbUpgradeAbstractImpl created so that all Upgraders extend it and inherit its logger * Upgrade log4j * fix errors caused by the merge * Refactor cglibThrowableRenderer functionality to log4j2 and upgrade the last configuration files * fix sonarcloud bug * Fix errors caused by merge, remove some unused loggers, and rename a variable that was mistakenly renamed on the normalization commit * Readd snmpTrapAppender, remove TestAppender * Regenerate changes * regenerate changes * refactor last custom appender * fix systemvm configuration xml * Regenerate changes * Regenerate changes * regenerate changes * Regenerate changes * regenerate changes * regenerate changes * regenerate changes * Fix utils pom * fix some tests * regenerate changes * Fix jar being printed on exception * fix logging in system VMs, fix commands not having log4j2 classpath. * regenerate changes * Fix some unwanted renomeations * fix end of file * regenerate changes * regenerate changes * fix merge error * regenerate changes * fix tests * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * readd reload4j to tungsten as juniper depends on it * Regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * re-add reload4j dependency to network-contrail, as juniper depends on it * regenerate changes * regenerate changes * regenerate changes * fix typo * regenerate changes * regenerate changes * Fix end of files * regenerate changes * add logj42 to cloud-utils-SHADED.jar * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * regenerate changes * Regenerate changes * Regenerate changes * Regenerate changes * regenerate changes * Regenerate changes * regenerate changes * Regenerate changes * Regenerate changes * Regenerate changes * regenerate changes * Regenerate changes * Regenerate changes * fix some tests * Regenerate changes * Regenerate changes * fix test * Regenerate changes * Regenerate changes
1 parent 2bfa9de commit 49cecae

File tree

2,097 files changed

+20428
-23657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,097 files changed

+20428
-23657
lines changed

‎agent/conf/log4j-cloud.xml.in‎

Lines changed: 57 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -17,91 +17,60 @@ KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
21-
22-
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
23-
24-
<!-- ================================= -->
25-
<!-- Preserve messages in a local file -->
26-
<!-- ================================= -->
27-
28-
<!-- A time/date based rolling appender -->
29-
<appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
30-
<param name="Append" value="true"/>
31-
<param name="Threshold" value="INFO"/>
32-
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
33-
<param name="FileNamePattern" value="@AGENTLOG@.%d{yyyy-MM-dd}.gz"/>
34-
<param name="ActiveFileName" value="@AGENTLOG@"/>
35-
</rollingPolicy>
36-
<layout class="org.apache.log4j.EnhancedPatternLayout">
37-
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
38-
</layout>
39-
</appender>
40-
41-
<!-- ============================== -->
42-
<!-- Append messages to the console -->
43-
<!-- ============================== -->
44-
45-
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
46-
<param name="Target" value="System.out"/>
47-
<param name="Threshold" value="INFO"/>
48-
49-
<layout class="org.apache.log4j.PatternLayout">
50-
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
51-
</layout>
52-
</appender>
53-
54-
<!-- ================ -->
55-
<!-- Limit categories -->
56-
<!-- ================ -->
57-
58-
<category name="com.cloud">
59-
<priority value="INFO"/>
60-
</category>
61-
62-
<category name="com.cloud.agent.metrics">
63-
<priority value="INFO"/>
64-
</category>
65-
66-
<category name="com.cloud.agent.resource.computing.ComputingResource$StorageMonitorTask">
67-
<priority value="INFO"/>
68-
</category>
69-
70-
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
71-
<category name="org.apache">
72-
<priority value="INFO"/>
73-
</category>
74-
75-
<category name="org">
76-
<priority value="INFO"/>
77-
</category>
78-
79-
<category name="net">
80-
<priority value="INFO"/>
81-
</category>
82-
83-
<!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose -->
84-
<category name="com.amazonaws">
85-
<priority value="INFO"/>
86-
</category>
87-
88-
<!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose -->
89-
<category name="httpclient.wire">
90-
<priority value="INFO"/>
91-
</category>
92-
93-
<category name="org.apache.http.wire">
94-
<priority value="INFO"/>
95-
</category>
96-
97-
<!-- ======================= -->
98-
<!-- Setup the Root category -->
99-
<!-- ======================= -->
100-
101-
<root>
102-
<level value="INFO"/>
103-
<appender-ref ref="CONSOLE"/>
104-
<appender-ref ref="FILE"/>
105-
</root>
106-
107-
</log4j:configuration>
20+
<Configuration monitorInterval="60">
21+
<Appenders>
22+
23+
<!-- ================================= -->
24+
<!-- Preserve messages in a local file -->
25+
<!-- ================================= -->
26+
27+
<!-- A time/date based rolling appender -->
28+
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
29+
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
30+
<Policies>
31+
<TimeBasedTriggeringPolicy/>
32+
</Policies>
33+
<PatternLayout pattern="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
34+
</RollingFile>
35+
36+
<!-- ============================== -->
37+
<!-- Append messages to the console -->
38+
<!-- ============================== -->
39+
40+
<Console name="CONSOLE" target="SYSTEM_OUT">
41+
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
42+
<PatternLayout pattern="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
43+
</Console>
44+
</Appenders>
45+
46+
<Loggers>
47+
48+
<!-- ================ -->
49+
<!-- Limit categories -->
50+
<!-- ================ -->
51+
52+
<Logger name="com.cloud" level="INFO"/>
53+
54+
<Logger name="org.apache" level="INFO"/>
55+
56+
<Logger name="org" level="INFO"/>
57+
58+
<Logger name="net" level="INFO"/>
59+
60+
<Logger name="com.amazonaws" level="INFO"/>
61+
62+
<Logger name="httpclient.wire" level="INFO"/>
63+
64+
<Logger name="org.apache.http.wire" level="INFO"/>
65+
66+
<!-- ======================= -->
67+
<!-- Setup the Root category -->
68+
<!-- ======================= -->
69+
70+
<Root level="INFO">
71+
<AppenderRef ref="CONSOLE"/>
72+
<AppenderRef ref="FILE"/>
73+
</Root>
74+
75+
</Loggers>
76+
</Configuration>

0 commit comments

Comments
 (0)