You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/10/30 11:40:59 UTC
[1/2] git commit: updated refs/heads/4.5 to ef90fec
Repository: cloudstack
Updated Branches:
refs/heads/4.5 bacf97122 -> ef90fec5e
CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs
Adds logrotate rules for cloudstack-agent.{err,out} log files
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba9a6004
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba9a6004
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba9a6004
Branch: refs/heads/4.5
Commit: ba9a600410c8d7818bb19e24b4389722ef6507e8
Parents: bacf971
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Oct 28 11:14:49 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Oct 29 11:14:04 2015 +0530
----------------------------------------------------------------------
agent/pom.xml | 6 ++++++
debian/cloudstack-agent.install | 1 +
debian/rules | 1 +
packaging/centos63/cloud.spec | 3 ++-
4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9a6004/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 5c04080..3603bce 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -92,6 +92,12 @@
</filterreader>
</filterchain>
</copy>
+ <copy
+ todir="${basedir}/target/transformed">
+ <fileset dir="${basedir}/conf">
+ <include name="cloudstack-agent.logrotate" />
+ </fileset>
+ </copy>
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9a6004/debian/cloudstack-agent.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install
index 94dd30d..82fce9f 100644
--- a/debian/cloudstack-agent.install
+++ b/debian/cloudstack-agent.install
@@ -19,6 +19,7 @@
/etc/cloudstack/agent/environment.properties
/etc/cloudstack/agent/log4j-cloud.xml
/etc/profile.d/cloudstack-agent-profile.sh
+/etc/logrotate.d/cloudstack-agent
/etc/init.d/cloudstack-agent
/usr/bin/cloudstack-setup-agent
/usr/bin/cloudstack-ssh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9a6004/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 3801ae2..45461bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ install:
install -D agent/target/transformed/cloud-setup-agent $(DESTDIR)/usr/bin/cloudstack-setup-agent
install -D agent/target/transformed/cloud-ssh $(DESTDIR)/usr/bin/cloudstack-ssh
install -D agent/target/transformed/cloudstack-agent-profile.sh $(DESTDIR)/$(SYSCONFDIR)/profile.d/cloudstack-agent-profile.sh
+ install -D agent/target/transformed/cloudstack-agent.logrotate $(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-agent
install -D agent/target/transformed/cloudstack-agent-upgrade $(DESTDIR)/usr/bin/cloudstack-agent-upgrade
install -D agent/target/transformed/libvirtqemuhook $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9a6004/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 133e11a..c8901a8 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -347,7 +347,7 @@ install -D agent/target/transformed/cloudstack-agent-upgrade ${RPM_BUILD_ROOT}%{
install -D agent/target/transformed/libvirtqemuhook ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh
install -D agent/target/transformed/cloudstack-agent-profile.sh ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/%{name}-agent-profile.sh
-install -D agent/target/transformed/cloudstack-agent.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/cloudstack-agent
+install -D agent/target/transformed/cloudstack-agent.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-agent
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%name-agent/lib/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
@@ -652,6 +652,7 @@ fi
%attr(0755,root,root) %{_bindir}/%{name}-ssh
%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-agent
%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
+%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent
%attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco
%config(noreplace) %{_sysconfdir}/%{name}/agent
%dir %{_localstatedir}/log/%{name}/agent
[2/2] git commit: updated refs/heads/4.5 to ef90fec
Posted by bh...@apache.org.
Merge pull request #993 from shapeblue/4.5-logrotate-kvm-agent-erroutlogs
[4.5] CLOUDSTACK-9000: logrotate cloudstack-agent out and err logsAdds logrotate rules for cloudstack-agent.{err,out} log files
cc @remibergsma @wido @wilderrodrigues and others
* pr/993:
CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef90fec5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef90fec5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef90fec5
Branch: refs/heads/4.5
Commit: ef90fec5eaba0b7a9f0707ee3bd5eed9aea9eedb
Parents: bacf971 ba9a600
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Oct 30 16:10:34 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Oct 30 16:10:34 2015 +0530
----------------------------------------------------------------------
agent/pom.xml | 6 ++++++
debian/cloudstack-agent.install | 1 +
debian/rules | 1 +
packaging/centos63/cloud.spec | 3 ++-
4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------