X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=pull-mail;h=a669a29508d9381b7e505908a1513e0f143e72fd;hp=828ec374f8e5a14e529ab9946c5cee090473f9e1;hb=8e8a70c71ec44dbf3347cce0c69652dddb47c586;hpb=8c8342151d388db43efcaeec44d82c2d1c835f1e

diff --git a/pull-mail b/pull-mail
index 828ec37..a669a29 100755
--- a/pull-mail
+++ b/pull-mail
@@ -1,7 +1,26 @@
 #! /bin/sh
 
-date >> ~/.fetchmail/log
-fetchmail >> ~/.fetchmail/log
-bsmtp-pull gluck
+if [ -f ~/.nomail ] && [ "$1" != --force ]; then
+	exit 0
+fi
+
+loadavg="$(cut -d. -f1 /proc/loadavg)"
+if [ "$loadavg" -ge 5 ] && [ "$1" != --force ]; then
+	# System load is too high. Don't contribute to it.
+	exit 0
+fi
+
+bsmtp-pull master
+
+hour="$(date +%H)"
+case $hour in
+    0[0-4789]|[12]*)
+	date >> ~/.fetchmail/log
+	fetchmail >> ~/.fetchmail/log
+	logrotate -s ~/.fetchmail/logrotate.status ~/.fetchmail/logrotate.conf
+	;;
+esac
+
+notmuch new >/dev/null 2>&1
 
 exit 0