Skip to content

Commit bc9fb41

Browse files
dheeraj12347dheeraj12347
committed
Clean up whitespace in log4j config files
1 parent 15c2f36 commit bc9fb41

4 files changed

Lines changed: 3 additions & 75 deletions

File tree

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ to you under the Apache License, Version 2.0 (the
88
"License"); you may not use this file except in compliance
99
with the License. You may obtain a copy of the License at
1010
11-
1211
http://www.apache.org/licenses/LICENSE-2.0
1312
14-
1513
Unless required by applicable law or agreed to in writing,
1614
software distributed under the License is distributed on an
1715
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,12 +20,10 @@ under the License.
2220
<Configuration monitorInterval="60">
2321
<Appenders>
2422

25-
2623
<!-- ================================= -->
2724
<!-- Preserve messages in a local file -->
2825
<!-- ================================= -->
2926

30-
3127
<!-- A time/date based rolling appender -->
3228
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
3329
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
@@ -37,12 +33,10 @@ under the License.
3733
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
3834
</RollingFile>
3935

40-
4136
<!-- ============================== -->
4237
<!-- Append messages to the console -->
4338
<!-- ============================== -->
4439

45-
4640
<Console name="CONSOLE" target="SYSTEM_OUT">
4741
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
4842
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
@@ -54,15 +48,12 @@ under the License.
5448
</Console>
5549
</Appenders>
5650

57-
5851
<Loggers>
5952

60-
6153
<!-- ================ -->
6254
<!-- Limit categories -->
6355
<!-- ================ -->
6456

65-
6657
<Logger name="com.cloud" level="INFO"/>
6758
<Logger name="org.apache" level="INFO"/>
6859
<Logger name="org" level="INFO"/>
@@ -71,18 +62,15 @@ under the License.
7162
<Logger name="httpclient.wire" level="INFO"/>
7263
<Logger name="org.apache.http.wire" level="INFO"/>
7364

74-
7565
<!-- ======================= -->
7666
<!-- Setup the Root category -->
7767
<!-- ======================= -->
7868

79-
8069
<Root level="INFO">
8170
<AppenderRef ref="CONSOLE"/>
8271
<AppenderRef ref="CONSOLE_ERR"/>
8372
<AppenderRef ref="FILE"/>
8473
</Root>
8574

86-
8775
</Loggers>
8876
</Configuration>

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

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ to you under the Apache License, Version 2.0 (the
88
"License"); you may not use this file except in compliance
99
with the License. You may obtain a copy of the License at
1010
11-
1211
http://www.apache.org/licenses/LICENSE-2.0
1312
14-
1513
Unless required by applicable law or agreed to in writing,
1614
software distributed under the License is distributed on an
1715
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,17 +20,14 @@ under the License.
2220
<Configuration monitorInterval="60" packages="org.apache.cloudstack.alert.snmp,org.apache.cloudstack.syslog">
2321
<Appenders>
2422

25-
2623
<properties>
27-
<property name="filters">net.sf.cglib.proxy</property>
24+
<property name="filters">net.sf.cglib.proxy</property>
2825
</properties>
2926

30-
3127
<!-- ================================= -->
3228
<!-- Preserve messages in a local file -->
3329
<!-- ================================= -->
3430

35-
3631
<!-- A regular appender -->
3732
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%d{yyyy-MM-dd}.gz">
3833
<ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
@@ -42,7 +37,6 @@ under the License.
4237
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
4338
</RollingFile>
4439

45-
4640
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
4741
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
4842
<Policies>
@@ -51,34 +45,28 @@ under the License.
5145
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
5246
</RollingFile>
5347

54-
5548
<!-- ============================== -->
5649
<!-- Append warnings+ to the syslog if it is listening on UDP port -->
5750
<!-- ============================== -->
5851

59-
6052
<Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
6153
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
6254
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
6355
</Syslog>
6456

65-
6657
<!-- ============================== -->
6758
<!-- Append alerts to the syslog if it is configured -->
6859
<!-- ============================== -->
6960

70-
7161
<AlertSyslogAppender name="ALERTSYSLOG" syslogHosts="" facility="LOCAL6">
7262
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
7363
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
7464
</AlertSyslogAppender>
7565

76-
7766
<!-- ============================== -->
7867
<!-- Append messages to the console -->
7968
<!-- ============================== -->
8069

81-
8270
<Console name="CONSOLE" target="SYSTEM_OUT">
8371
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
8472
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
@@ -89,62 +77,45 @@ under the License.
8977
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
9078
</Console>
9179

92-
9380
<!-- ============================== -->
9481
<!-- send alert warnings+ as the SNMP trap if it is configured! -->
9582
<!-- ============================== -->
9683

97-
9884
<SnmpTrapAppender name="SNMP" SnmpManagerIpAddresses="" SnmpManagerPorts="" SnmpManagerCommunities="">
99-
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
85+
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
10086
</SnmpTrapAppender>
10187
</Appenders>
10288

103-
10489
<Loggers>
10590

106-
10791
<Logger name="com.cloud" level="DEBUG"/>
10892

109-
11093
<Logger name="org.apache.cloudstack" level="DEBUG"/>
11194

112-
11395
<Logger name="com.cloud.utils.nio" level="INFO"/>
11496

115-
11697
<Logger name="org.apache" level="INFO"/>
11798

118-
11999
<Logger name="org.apache.cloudstack.api.command" level="DEBUG"/>
120100

121-
122101
<Logger name="org" level="INFO"/>
123102

124-
125103
<Logger name="org.springframework" level="WARN"/>
126104

127-
128105
<Logger name="org.apache.cloudstack.spring.module.context.ResourceApplicationContext" level="WARN"/>
129106

130-
131107
<Logger name="net" level="INFO"/>
132108

133-
134-
<Logger name="apiserver.com.cloud" level="DEBUG"/>
135-
109+
<Logger name="apiserver.com.cloud" level="DEBUG"/>
136110

137111
<Logger name="apiserver.com.cloud" level="DEBUG" additivity="false">
138112
<AppenderRef ref="APISERVER"/>
139113
</Logger>
140114

141-
142115
<Logger name="com.amazonaws" level="INFO"/>
143116

144-
145117
<Logger name="httpclient.wire" level="INFO"/>
146118

147-
148119
<Logger name="org.apache.cloudstack.alert" additivity="false" level="WARN">
149120
<AppenderRef ref="SYSLOG"/>
150121
<AppenderRef ref="CONSOLE"/>
@@ -154,19 +125,16 @@ under the License.
154125
<AppenderRef ref="ALERTSYSLOG"/>
155126
</Logger>
156127

157-
158128
<!-- ======================= -->
159129
<!-- Setup the Root category -->
160130
<!-- ======================= -->
161131

162-
163132
<Root level="INFO">
164133
<AppenderRef ref="SYSLOG"/>
165134
<AppenderRef ref="CONSOLE"/>
166135
<AppenderRef ref="CONSOLE_ERR"/>
167136
<AppenderRef ref="FILE"/>
168137
</Root>
169138

170-
171139
</Loggers>
172140
</Configuration>

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ to you under the Apache License, Version 2.0 (the
88
"License"); you may not use this file except in compliance
99
with the License. You may obtain a copy of the License at
1010
11-
1211
http://www.apache.org/licenses/LICENSE-2.0
1312
14-
1513
Unless required by applicable law or agreed to in writing,
1614
software distributed under the License is distributed on an
1715
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,12 +20,10 @@ under the License.
2220
<Configuration monitorInterval="60">
2321
<Appenders>
2422

25-
2623
<!-- ================================= -->
2724
<!-- Preserve messages in a local file -->
2825
<!-- ================================= -->
2926

30-
3127
<!-- A regular appender -->
3228
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%d{yyyy-MM-dd}.gz">
3329
<ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
@@ -37,7 +33,6 @@ under the License.
3733
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
3834
</RollingFile>
3935

40-
4136
<RollingFile name="INFO-FILE" append="true" fileName="/var/log/cloudstack/management/management-server-info.log" filePattern="/var/log/cloudstack/management/management-server-info.log.%d{yyyy-MM-dd}.gz">
4237
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
4338
<Policies>
@@ -46,7 +41,6 @@ under the License.
4641
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4742
</RollingFile>
4843

49-
5044
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
5145
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
5246
<Policies>
@@ -55,23 +49,19 @@ under the License.
5549
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
5650
</RollingFile>
5751

58-
5952
<!-- ============================== -->
6053
<!-- Append warnings+ to the syslog if it is listening on UDP port -->
6154
<!-- ============================== -->
6255

63-
6456
<Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
6557
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
6658
<PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/>
6759
</Syslog>
6860

69-
7061
<!-- ============================== -->
7162
<!-- Append messages to the console -->
7263
<!-- ============================== -->
7364

74-
7565
<Console name="CONSOLE" target="SYSTEM_OUT">
7666
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
7767
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
@@ -83,44 +73,32 @@ under the License.
8373
</Console>
8474
</Appenders>
8575

86-
8776
<Loggers>
8877

89-
9078
<Logger name="com.cloud" level="DEBUG"/>
9179

92-
9380
<Logger name="org.apache.cloudstack" level="DEBUG"/>
9481

95-
9682
<Logger name="org.apache" level="INFO"/>
9783

98-
9984
<Logger name="org" level="INFO"/>
10085

101-
10286
<Logger name="net" level="INFO"/>
10387

104-
10588
<Logger name="apiserver.com.cloud" level="DEBUG"/>
10689

107-
10890
<Logger name="apiserver.com.cloud" level="DEBUG" additivity="false">
10991
<AppenderRef ref="APISERVER"/>
11092
</Logger>
11193

112-
11394
<Logger name="com.amazonaws" level="INFO"/>
11495

115-
11696
<Logger name="httpclient.wire" level="INFO"/>
11797

118-
11998
<!-- ============================== -->
12099
<!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin -->
121100
<!-- ============================== -->
122101

123-
124102
<Logger name="org.apache.cloudstack.alerts" additivity="false" level="WARN">
125103
<AppenderRef ref="SYSLOG"/>
126104
<AppenderRef ref="CONSOLE"/>
@@ -130,12 +108,10 @@ under the License.
130108
<AppenderRef ref="ALERTSYSLOG"/>
131109
</Logger>
132110

133-
134111
<!-- ======================= -->
135112
<!-- Setup the Root category -->
136113
<!-- ======================= -->
137114

138-
139115
<Root level="INFO">
140116
<AppenderRef ref="SYSLOG"/>
141117
<AppenderRef ref="CONSOLE"/>
@@ -144,6 +120,5 @@ under the License.
144120
<AppenderRef ref="INFO-FILE"/>
145121
</Root>
146122

147-
148123
</Loggers>
149124
</Configuration>

‎usage/conf/log4j-cloud_usage.xml.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@ under the License.
5353
<!-- ================ -->
5454

5555
<Logger name="com.cloud" level="DEBUG"/>
56-
5756
<Logger name="org.apache" level="INFO"/>
58-
5957
<Logger name="org" level="INFO"/>
60-
6158
<Logger name="net" level="INFO"/>
6259

6360
<!-- ======================= -->

0 commit comments

Comments
 (0)