From 7e480a1ed11ff5813b242d96971b32c2672a73fd Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 20 May 2014 20:54:13 +0000
Subject: [PATCH] Remove old non-gz files in log archive maintenance

* modules/openstack_project/files/log_archive_maintenance.sh: Start
matching for removal on any files in the logs tree besides those we
explicitly don't compress. Also do it via a refactor to allow for
improved optimization and avoid unnecessary redundancy.

Change-Id: I5ff6defb4d403f3017ab098c2ac1df3777662933
---
 .../files/log_archive_maintenance.sh          | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/modules/openstack_project/files/log_archive_maintenance.sh b/modules/openstack_project/files/log_archive_maintenance.sh
index 2f4c140d16..c3f89eb7f8 100644
--- a/modules/openstack_project/files/log_archive_maintenance.sh
+++ b/modules/openstack_project/files/log_archive_maintenance.sh
@@ -1,20 +1,13 @@
 #!/bin/sh
 sleep $((RANDOM%600)) && \
 flock -n /var/run/gziplogs.lock \
-find -O3 /srv/static/logs/ -depth \
-    \( \
-      \( -type f -mmin +10 -not -name robots.txt \
-          -not -wholename /srv/static/logs/help/\* \
-          -not -name \*\[.-\]gz -not -name \*\[._-\]\[zZ\] \
-          \( -name \*.txt -or -name \*.html -or -name tmp\* \) \
-          -exec gzip \{\} \; \) \
-      -o \( -type f -mtime +120 -name \*.gz -execdir rm \{\} \; \) \
-      -o \( -type d -not -name lost+found -empty -mtime +1 \
-          -execdir rmdir {} \; \) \
-    \)
-find -O3 /srv/static/docs-draft/ -depth \
-    \( \
-      \( -type f -mtime +21 -name \*.gz -execdir rm \{\} \; \) \
-      -o \( -type d -not -name lost+found -empty -mtime +1 \
-          -execdir rmdir {} \; \) \
-    \)
+find -O3 /srv/static/logs/ -depth -not -name robots.txt -not -name lost+found \
+        -not -wholename /srv/static/logs/help/\* \( \
+    \( -type f -mmin +10 -not -name \*\[.-\]gz -not -name \*\[._-\]\[zZ\] \
+        \( -name \*.txt -or -name \*.html -or -name tmp\* \) \
+        -exec gzip \{\} \; \) \
+    -o \( -type f -mtime +120 -execdir rm \{\} \; \) \
+    -o \( -type d -not -empty -mtime +1 -execdir rmdir {} \; \) \)
+find -O3 /srv/static/docs-draft/ -depth -not -name lost+found \( \
+    \( -type f -mtime +21 -name \*.gz -execdir rm \{\} \; \) \
+    -o \( -type d -empty -mtime +1 -execdir rmdir {} \; \) \)