From 994d8c63a815cc9c10fef8373b340d5b99fd5840 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 6 Feb 2016 12:39:35 -0500 Subject: [PATCH] Add locking to invirt-cache-acls --- debian/changelog | 8 ++++++++ debian/control | 4 +++- invirt-cache-acls | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fc161a..d016a44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +invirt-web (0.1.45) precise; urgency=medium + + * Add trusty preseed files that we apparently forgot to package + * Add locking to invirt-cache-acls so that when it takes more than five + minutes, jobs don't pile up and make the machine thrash to death + + -- Adam Glasgall Sat, 06 Feb 2016 12:37:27 -0500 + invirt-web (0.1.44) unstable; urgency=medium * Remove quadratic-complexity keylogger from Konami easter egg. diff --git a/debian/control b/debian/control index be460f3..53e89e0 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,9 @@ Depends: ${misc:Depends}, kstart, debathena-afs-config, openafs-modules-dkms, mail-transport-agent, subversion, zephyr-clients, - cron, gitweb + cron, gitweb, +# for with-lock-ex + chiark-utils-bin Provides: ${diverted-files} Conflicts: ${diverted-files} Replaces: invirt-web-iptables (<= 0.0.2) diff --git a/invirt-cache-acls b/invirt-cache-acls index 79a7650..a8953d4 100755 --- a/invirt-cache-acls +++ b/invirt-cache-acls @@ -6,4 +6,4 @@ cells () { } kinit -k -t /etc/invirt/keytab daemon/$(hostname -f) aklog $(cells) -python /var/www/invirt-web/cache_acls.py +with-lock-ex -f /run/invirt-cache-acls.lock python /var/www/invirt-web/cache_acls.py -- 1.7.9.5