summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-21 13:29:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-21 13:29:42 -0400
commit28eff15a84cef8215903c9996ec20d8af4fce286 (patch)
tree154abc6d345078eb7fa52ac0d1dd9dab5ff54e10
parent5e255e21f93304df5227cdff8a1d13ed3d50f58b (diff)
assistant: Daily sanity check thread is run niced.
-rw-r--r--Assistant/Threads/SanityChecker.hs3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs
index a6166214a..0c97a9e8f 100644
--- a/Assistant/Threads/SanityChecker.hs
+++ b/Assistant/Threads/SanityChecker.hs
@@ -19,6 +19,7 @@ import qualified Git.Config
import Utility.ThreadScheduler
import qualified Assistant.Threads.Watcher as Watcher
import Utility.LogFile
+import Utility.Batch
import Config
import Data.Time.Clock.POSIX
@@ -42,7 +43,7 @@ sanityCheckerDailyThread = namedThread "SanityCheckerDaily" $ forever $ do
modifyDaemonStatus_ $ \s -> s { sanityCheckRunning = True }
now <- liftIO $ getPOSIXTime -- before check started
- r <- either showerr return =<< tryIO <~> dailyCheck
+ r <- either showerr return =<< (tryIO . batch) <~> dailyCheck
modifyDaemonStatus_ $ \s -> s
{ sanityCheckRunning = False
diff --git a/debian/changelog b/debian/changelog
index 732222f90..6b6685d06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
git-annex (4.20130622) UNRELEASED; urgency=low
* assistant --autostart: Automatically ionices the daemons it starts.
+ * assistant: Daily sanity check thread is run niced.
-- Joey Hess <joeyh@debian.org> Fri, 21 Jun 2013 13:16:17 -0400