Skip to content

Commit 36060f0

Browse files
dheeraj12347dheeraj12347
committed
Add timestamps to stderr console logs for agent, management and API server
1 parent 45c3bbe commit 36060f0

3 files changed

Lines changed: 93 additions & 4 deletions

File tree

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ 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+
1112
http://www.apache.org/licenses/LICENSE-2.0
1213
14+
1315
Unless required by applicable law or agreed to in writing,
1416
software distributed under the License is distributed on an
1517
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,10 +22,12 @@ under the License.
2022
<Configuration monitorInterval="60">
2123
<Appenders>
2224

25+
2326
<!-- ================================= -->
2427
<!-- Preserve messages in a local file -->
2528
<!-- ================================= -->
2629

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

40+
3641
<!-- ============================== -->
3742
<!-- Append messages to the console -->
3843
<!-- ============================== -->
3944

45+
4046
<Console name="CONSOLE" target="SYSTEM_OUT">
41-
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
42-
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
47+
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
48+
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
49+
</Console>
50+
51+
<Console name="CONSOLE_ERR" target="SYSTEM_ERR">
52+
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
53+
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4354
</Console>
4455
</Appenders>
4556

57+
4658
<Loggers>
4759

60+
4861
<!-- ================ -->
4962
<!-- Limit categories -->
5063
<!-- ================ -->
5164

65+
5266
<Logger name="com.cloud" level="INFO"/>
5367
<Logger name="org.apache" level="INFO"/>
5468
<Logger name="org" level="INFO"/>
@@ -57,14 +71,18 @@ under the License.
5771
<Logger name="httpclient.wire" level="INFO"/>
5872
<Logger name="org.apache.http.wire" level="INFO"/>
5973

74+
6075
<!-- ======================= -->
6176
<!-- Setup the Root category -->
6277
<!-- ======================= -->
6378

79+
6480
<Root level="INFO">
6581
<AppenderRef ref="CONSOLE"/>
82+
<AppenderRef ref="CONSOLE_ERR"/>
6683
<AppenderRef ref="FILE"/>
6784
</Root>
6885

86+
6987
</Loggers>
7088
</Configuration>

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

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ 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+
1112
http://www.apache.org/licenses/LICENSE-2.0
1213
14+
1315
Unless required by applicable law or agreed to in writing,
1416
software distributed under the License is distributed on an
1517
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,14 +22,17 @@ under the License.
2022
<Configuration monitorInterval="60" packages="org.apache.cloudstack.alert.snmp,org.apache.cloudstack.syslog">
2123
<Appenders>
2224

25+
2326
<properties>
2427
<property name="filters">net.sf.cglib.proxy</property>
2528
</properties>
2629

30+
2731
<!-- ================================= -->
2832
<!-- Preserve messages in a local file -->
2933
<!-- ================================= -->
3034

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

45+
4046
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
4147
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
4248
<Policies>
@@ -45,89 +51,122 @@ under the License.
4551
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
4652
</RollingFile>
4753

54+
4855
<!-- ============================== -->
4956
<!-- Append warnings+ to the syslog if it is listening on UDP port -->
5057
<!-- ============================== -->
5158

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

65+
5766
<!-- ============================== -->
5867
<!-- Append alerts to the syslog if it is configured -->
5968
<!-- ============================== -->
6069

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

76+
6677
<!-- ============================== -->
6778
<!-- Append messages to the console -->
6879
<!-- ============================== -->
6980

81+
7082
<Console name="CONSOLE" target="SYSTEM_OUT">
71-
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
83+
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
7284
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
7385
</Console>
7486

87+
<Console name="CONSOLE_ERR" target="SYSTEM_ERR">
88+
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
89+
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
90+
</Console>
91+
92+
7593
<!-- ============================== -->
7694
<!-- send alert warnings+ as the SNMP trap if it is configured! -->
7795
<!-- ============================== -->
7896

97+
7998
<SnmpTrapAppender name="SNMP" SnmpManagerIpAddresses="" SnmpManagerPorts="" SnmpManagerCommunities="">
8099
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
81100
</SnmpTrapAppender>
82101
</Appenders>
83102

103+
84104
<Loggers>
85105

106+
86107
<Logger name="com.cloud" level="DEBUG"/>
87108

109+
88110
<Logger name="org.apache.cloudstack" level="DEBUG"/>
89111

112+
90113
<Logger name="com.cloud.utils.nio" level="INFO"/>
91114

115+
92116
<Logger name="org.apache" level="INFO"/>
93117

118+
94119
<Logger name="org.apache.cloudstack.api.command" level="DEBUG"/>
95120

121+
96122
<Logger name="org" level="INFO"/>
97123

124+
98125
<Logger name="org.springframework" level="WARN"/>
99126

127+
100128
<Logger name="org.apache.cloudstack.spring.module.context.ResourceApplicationContext" level="WARN"/>
101129

130+
102131
<Logger name="net" level="INFO"/>
103132

133+
104134
<Logger name="apiserver.com.cloud" level="DEBUG"/>
105135

136+
106137
<Logger name="apiserver.com.cloud" level="DEBUG" additivity="false">
107138
<AppenderRef ref="APISERVER"/>
108139
</Logger>
109140

141+
110142
<Logger name="com.amazonaws" level="INFO"/>
111143

144+
112145
<Logger name="httpclient.wire" level="INFO"/>
113146

147+
114148
<Logger name="org.apache.cloudstack.alert" additivity="false" level="WARN">
115149
<AppenderRef ref="SYSLOG"/>
116150
<AppenderRef ref="CONSOLE"/>
151+
<AppenderRef ref="CONSOLE_ERR"/>
117152
<AppenderRef ref="FILE"/>
118153
<AppenderRef ref="SNMP"/>
119154
<AppenderRef ref="ALERTSYSLOG"/>
120155
</Logger>
121156

157+
122158
<!-- ======================= -->
123159
<!-- Setup the Root category -->
124160
<!-- ======================= -->
125161

162+
126163
<Root level="INFO">
127164
<AppenderRef ref="SYSLOG"/>
128165
<AppenderRef ref="CONSOLE"/>
166+
<AppenderRef ref="CONSOLE_ERR"/>
129167
<AppenderRef ref="FILE"/>
130168
</Root>
131169

170+
132171
</Loggers>
133172
</Configuration>

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ 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+
1112
http://www.apache.org/licenses/LICENSE-2.0
1213
14+
1315
Unless required by applicable law or agreed to in writing,
1416
software distributed under the License is distributed on an
1517
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,10 +22,12 @@ under the License.
2022
<Configuration monitorInterval="60">
2123
<Appenders>
2224

25+
2326
<!-- ================================= -->
2427
<!-- Preserve messages in a local file -->
2528
<!-- ================================= -->
2629

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

40+
3641
<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">
3742
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
3843
<Policies>
@@ -41,6 +46,7 @@ under the License.
4146
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4247
</RollingFile>
4348

49+
4450
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
4551
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
4652
<Policies>
@@ -49,69 +55,95 @@ under the License.
4955
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
5056
</RollingFile>
5157

58+
5259
<!-- ============================== -->
5360
<!-- Append warnings+ to the syslog if it is listening on UDP port -->
5461
<!-- ============================== -->
5562

63+
5664
<Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
5765
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
5866
<PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/>
5967
</Syslog>
6068

69+
6170
<!-- ============================== -->
6271
<!-- Append messages to the console -->
6372
<!-- ============================== -->
6473

74+
6575
<Console name="CONSOLE" target="SYSTEM_OUT">
66-
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
76+
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="ACCEPT"/>
77+
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
78+
</Console>
79+
80+
<Console name="CONSOLE_ERR" target="SYSTEM_ERR">
81+
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
6782
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
6883
</Console>
6984
</Appenders>
7085

86+
7187
<Loggers>
7288

89+
7390
<Logger name="com.cloud" level="DEBUG"/>
7491

92+
7593
<Logger name="org.apache.cloudstack" level="DEBUG"/>
7694

95+
7796
<Logger name="org.apache" level="INFO"/>
7897

98+
7999
<Logger name="org" level="INFO"/>
80100

101+
81102
<Logger name="net" level="INFO"/>
82103

104+
83105
<Logger name="apiserver.com.cloud" level="DEBUG"/>
84106

107+
85108
<Logger name="apiserver.com.cloud" level="DEBUG" additivity="false">
86109
<AppenderRef ref="APISERVER"/>
87110
</Logger>
88111

112+
89113
<Logger name="com.amazonaws" level="INFO"/>
90114

115+
91116
<Logger name="httpclient.wire" level="INFO"/>
92117

118+
93119
<!-- ============================== -->
94120
<!-- Add or remove these logger for SNMP, this logger is for SNMP alerts plugin -->
95121
<!-- ============================== -->
96122

123+
97124
<Logger name="org.apache.cloudstack.alerts" additivity="false" level="WARN">
98125
<AppenderRef ref="SYSLOG"/>
99126
<AppenderRef ref="CONSOLE"/>
127+
<AppenderRef ref="CONSOLE_ERR"/>
100128
<AppenderRef ref="FILE"/>
101129
<AppenderRef ref="SNMP"/>
102130
<AppenderRef ref="ALERTSYSLOG"/>
103131
</Logger>
104132

133+
105134
<!-- ======================= -->
106135
<!-- Setup the Root category -->
107136
<!-- ======================= -->
108137

138+
109139
<Root level="INFO">
110140
<AppenderRef ref="SYSLOG"/>
111141
<AppenderRef ref="CONSOLE"/>
142+
<AppenderRef ref="CONSOLE_ERR"/>
112143
<AppenderRef ref="FILE"/>
113144
<AppenderRef ref="INFO-FILE"/>
114145
</Root>
115146

147+
116148
</Loggers>
117149
</Configuration>

0 commit comments

Comments
 (0)