From 714fa40191b2a8dde98bf6fc0a132d5d3fbdf910 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 2 Jun 2014 18:15:37 +0000 Subject: [PATCH] Fix empty directory removal for log expiration * modules/openstack_project/files/log_archive_maintenance.sh: The refactoring in I5ff6defb4d403f3017ab098c2ac1df3777662933 orphaned a stray -not in the directory removal expression, inverting the meaning of -empty as a result. Luckily non-empty directories can't be removed without additional effort, so no data was lost (just some very large cronspam sent instead). This removes the remaining cruft. Change-Id: Ie6ce39ed46eedfaaf0771ab1a91f5f50c90c1b62 --- modules/openstack_project/files/log_archive_maintenance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/files/log_archive_maintenance.sh b/modules/openstack_project/files/log_archive_maintenance.sh index c3f89eb7f8..36f186fe96 100644 --- a/modules/openstack_project/files/log_archive_maintenance.sh +++ b/modules/openstack_project/files/log_archive_maintenance.sh @@ -7,7 +7,7 @@ find -O3 /srv/static/logs/ -depth -not -name robots.txt -not -name lost+found \ \( -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 {} \; \) \) + -o \( -type d -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 {} \; \) \)