From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 2 Nov 2007 14:53:27 +0000 (+0000)
Subject: append to log file; use logrotate;
X-Git-Tag: vserver-4.2-0~24
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=5a949b31060abe2a1cc2d0437dced8dbb01f1026

append to log file; use logrotate;
---

diff --git a/vserver-reference.init b/vserver-reference.init
index 52964c9..56c4de5 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -30,6 +30,16 @@ esac
 # VServer definitions
 . /usr/lib/util-vserver/util-vserver-vars
 
+# Save stdout and stderr
+exec 3>&1
+exec 4>&2
+
+# Redirect stdout and stderr to a log file
+exec 2>&1
+exec &>>/var/log/vserver-reference.log
+
+echo "--- STARTING $(date) ---"  >&3 2>&4
+
 # Parse PLC configuration
 if [ -r /etc/planetlab/plc_config ] ; then
     . /etc/planetlab/plc_config
@@ -39,14 +49,6 @@ else
     PLC_BOOT_HOST="boot.planet-lab.org"
 fi
 
-# Save stdout and stderr
-exec 3>&1
-exec 4>&2
-
-# Redirect stdout and stderr to a log file
-exec 2>&1
-exec &>/var/log/vserver-reference.log
-
 shopt -s nullglob
 
 # Make sure the barrier bit is set
@@ -141,6 +143,7 @@ for cacert in $CACERT ; do
 done
 
 success >&3 2>&4
+echo "--- DONE $(date) ---"  >&3 2>&4
 echo >&3 2>&4
 
 exit 0
diff --git a/vserver-reference.logrotate b/vserver-reference.logrotate
new file mode 100644
index 0000000..9c17e71
--- /dev/null
+++ b/vserver-reference.logrotate
@@ -0,0 +1,8 @@
+/var/log/vserver-reference {
+    copytruncate
+    compress
+    daily
+    notifempty
+    rotate 5
+    missingok
+}
diff --git a/vserver-reference.spec b/vserver-reference.spec
index bdac8ff..97f73d7 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -57,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 pushd VserverReference
 install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
 install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
+install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference
 find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
 popd
 
@@ -78,6 +79,7 @@ fi
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
 %{_sysconfdir}/cron.d/vserver-reference
+%{_sysconfdir}/logrotate.d/vserver-reference
 /vservers/.vref/default
 
 %files system-packages