Skip to content

Commit faf9438

Browse files
vishesh92vishesh92
authored
Disable logs to stdout and capture remaining stdout logs to a file (apache#8880)
* Log stdout to a file * Add logrotation
1 parent 3b8d220 commit faf9438

13 files changed

Lines changed: 81 additions & 5 deletions

‎agent/conf/cloudstack-agent.logrotate.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log {
18+
/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log /var/log/cloudstack/agent/agent.out /var/log/cloudstack/agent/agent.err {
1919
copytruncate
2020
daily
2121
rotate 5
2222
compress
2323
missingok
2424
size 10M
25+
dateext
26+
dateformat -%Y-%m-%d
2527
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ under the License.
3838
<!-- ============================== -->
3939

4040
<Console name="CONSOLE" target="SYSTEM_OUT">
41-
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
41+
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
4242
<PatternLayout pattern="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4343
</Console>
4444
</Appenders>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ under the License.
6969
<!-- ============================== -->
7070

7171
<Console name="CONSOLE" target="SYSTEM_OUT">
72-
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
72+
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
7373
<PatternLayout pattern="%-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
7474
</Console>
7575

‎debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ override_dh_auto_install:
103103
install -m0644 packaging/systemd/$(PACKAGE)-management.service debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service
104104
install -m0644 packaging/systemd/$(PACKAGE)-management.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management
105105

106+
install -D -m0644 server/target/conf/cloudstack-management.logrotate $(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-management
107+
106108
# cloudstack-ui
107109
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/ui
108110
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-ui
@@ -159,6 +161,8 @@ override_dh_auto_install:
159161
install -m0644 packaging/systemd/$(PACKAGE)-usage.service debian/$(PACKAGE)-usage/lib/systemd/system/$(PACKAGE)-usage.service
160162
install -m0644 packaging/systemd/$(PACKAGE)-usage.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-usage
161163

164+
install -D -m0644 usage/target/transformed/cloudstack-usage.logrotate $(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-usage
165+
162166
# cloudstack-marvin
163167
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-marvin
164168
cp tools/marvin/dist/Marvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/

‎packaging/centos7/cloud.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ install -D packaging/systemd/cloudstack-management.default ${RPM_BUILD_ROOT}%{_s
314314
install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
315315
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
316316
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
317+
install -D server/target/conf/cloudstack-management.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-management
317318

318319
# SystemVM template
319320
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
@@ -378,6 +379,7 @@ cp client/target/lib/mysql*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
378379
install -D packaging/systemd/cloudstack-usage.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-usage.service
379380
install -D packaging/systemd/cloudstack-usage.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-usage
380381
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
382+
install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-usage
381383

382384
# CLI
383385
cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/
@@ -623,6 +625,7 @@ pip3 install --upgrade urllib3
623625
%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
624626
%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
625627
#%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina
628+
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-management
626629
%{_datadir}/%{name}-management/setup/wheel/*.whl
627630

628631
%files agent
@@ -670,6 +673,7 @@ pip3 install --upgrade urllib3
670673
%files usage
671674
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
672675
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
676+
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-usage
673677
%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
674678
%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
675679
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage

‎packaging/centos8/cloud.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ install -D packaging/systemd/cloudstack-management.default ${RPM_BUILD_ROOT}%{_s
296296
install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
297297
touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}-management.pid
298298
#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
299+
install -D server/target/conf/cloudstack-management.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-management
299300

300301
# SystemVM template
301302
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
@@ -360,6 +361,7 @@ cp client/target/lib/mysql*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
360361
install -D packaging/systemd/cloudstack-usage.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-usage.service
361362
install -D packaging/systemd/cloudstack-usage.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-usage
362363
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
364+
install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-usage
363365

364366
# Marvin
365367
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
@@ -577,6 +579,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
577579
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j2.xml
578580
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
579581
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
582+
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-management
580583
%attr(0644,root,root) %{_unitdir}/%{name}-management.service
581584
%attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid
582585
%attr(0755,root,root) %{_bindir}/%{name}-setup-management
@@ -648,6 +651,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
648651
%files usage
649652
%attr(0644,root,root) %{_unitdir}/%{name}-usage.service
650653
%config(noreplace) %{_sysconfdir}/default/%{name}-usage
654+
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-usage
651655
%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
652656
%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
653657
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage

‎packaging/systemd/cloudstack-agent.service‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ EnvironmentFile=/etc/default/cloudstack-agent
3131
ExecStart=/usr/bin/java $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS
3232
Restart=always
3333
RestartSec=10s
34+
StandardOutput=append:/var/log/cloudstack/agent/agent.out
35+
StandardError=append:/var/log/cloudstack/agent/agent.err
3436

3537
[Install]
3638
WantedBy=multi-user.target

‎packaging/systemd/cloudstack-management.service‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ EnvironmentFile=/etc/default/cloudstack-management
3535
WorkingDirectory=/var/log/cloudstack/management
3636
PIDFile=/var/run/cloudstack-management.pid
3737
ExecStart=/usr/bin/java $JAVA_DEBUG $JAVA_OPTS -cp $CLASSPATH $BOOTSTRAP_CLASS
38+
StandardOutput=append:/var/log/cloudstack/management/management-server.out
39+
StandardError=append:/var/log/cloudstack/management/management-server.err
3840

3941
[Install]
4042
WantedBy=multi-user.target

‎packaging/systemd/cloudstack-usage.service‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Environment=JAVA_PID=$$
3535
ExecStart=/bin/sh -ec '/usr/bin/java -Dpid=${JAVA_PID} $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS'
3636
Restart=always
3737
RestartSec=10s
38+
StandardOutput=append:/var/log/cloudstack/usage/usage.out
39+
StandardError=append:/var/log/cloudstack/usage/usage.err
3840

3941
[Install]
4042
WantedBy=multi-user.target

‎server/conf/cloudstack-management.logrotate.in‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
/var/log/cloudstack/management/management-server.out /var/log/cloudstack/management/management-server.err {
19+
su root root
20+
copytruncate
21+
daily
22+
rotate 5
23+
compress
24+
missingok
25+
size 10M
26+
dateext
27+
dateformat -%Y-%m-%d
28+
}

0 commit comments

Comments
 (0)