Skip to content

Commit ebc5744

Browse files
author
Bernardo De Marco Gonçalves
committed
Merge branch 'pid-in-logs' into '4.20.0.0-scclouds'
Adiciona o PID do processo aos logs Closes #3090 See merge request scclouds/scclouds!1357
2 parents 27d1b2d + 8ba86d0 commit ebc5744

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

agent/conf/log4j-cloud.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ under the License.
3030
<Policies>
3131
<TimeBasedTriggeringPolicy/>
3232
</Policies>
33-
<PatternLayout pattern="%d{DEFAULT} [${hostName}] %-5p [%c{3}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
33+
<PatternLayout pattern="%d{DEFAULT} [${hostName} - %pid] %-5p [%c{3}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
3434
</RollingFile>
3535

3636
<!-- ============================== -->

client/conf/log4j-cloud.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ under the License.
3434
<Policies>
3535
<TimeBasedTriggeringPolicy/>
3636
</Policies>
37-
<PatternLayout pattern="%d{DEFAULT} [${hostName}] %-5p [%c{1.}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
37+
<PatternLayout pattern="%d{DEFAULT} [${hostName} - %pid] %-5p [%c{1.}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
3838
</RollingFile>
3939

4040

server/conf/log4j-cloud.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ under the License.
3131
<Policies>
3232
<TimeBasedTriggeringPolicy/>
3333
</Policies>
34-
<PatternLayout pattern="%d{DEFAULT} [${hostName}] %-5p [%c{1.}:%L] (%t:%x) %m%ex%n"/>
34+
<PatternLayout pattern="%d{DEFAULT} [${hostName} - %pid] %-5p [%c{1.}:%L] (%t:%x) %m%ex%n"/>
3535
</RollingFile>
3636

3737

systemvm/agent/conf/log4j-cloud.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ under the License.
2929
<SizeBasedTriggeringPolicy size="10000KB"/>
3030
</Policies>
3131
<DefaultRolloverStrategy max="4"/>
32-
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName}] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
32+
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName} - %pid] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
3333
</RollingFile>
3434

3535
<RollingFile name="cloudOut" append="true" fileName="/var/log/cloud/cloud.out" filePattern="/var/log/cloud/cloud.%i.out">
@@ -38,7 +38,7 @@ under the License.
3838
<SizeBasedTriggeringPolicy size="10000KB"/>
3939
</Policies>
4040
<DefaultRolloverStrategy max="4"/>
41-
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName}] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
41+
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName} - %pid] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
4242
</RollingFile>
4343

4444
<RollingFile name="cloudSystemvmLog" append="true" fileName="/usr/local/cloud/systemvm/cloud.log" filePattern="/usr/local/cloud/systemvm/cloud.%i.log">
@@ -47,7 +47,7 @@ under the License.
4747
<SizeBasedTriggeringPolicy size="10000KB"/>
4848
</Policies>
4949
<DefaultRolloverStrategy max="4"/>
50-
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName}] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
50+
<PatternLayout pattern="%d{ISO8601}{GMT} [${hostName} - %pid] %-5p [%c{3}:%L] (%t:%x) %m%ex%n"/>
5151
</RollingFile>
5252

5353
<RollingFile name="APISERVER" append="true" fileName="/var/log/cloud/api-server.log" filePattern="/var/log/cloud/api-server.log.%d{yyyy-MM-dd}{GMT}.gz">

usage/conf/log4j-cloud_usage.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ under the License.
3939
<Policies>
4040
<TimeBasedTriggeringPolicy/>
4141
</Policies>
42-
<PatternLayout pattern="%d{DEFAULT} [${hostName}] %-5p [%c{3}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
42+
<PatternLayout pattern="%d{DEFAULT} [${hostName} - %pid] %-5p [%c{3}:%L] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4343
</RollingFile>
4444
</Appenders>
4545

0 commit comments

Comments
 (0)