From ecf10abc478fefe239d469c2f03f05583ed4782b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Apr 2014 19:32:10 -0400 Subject: flock local directory to prevent multiple obnams stacking up --- Propellor/Property/Obnam.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs index 00e0bbef..1e861588 100644 --- a/Propellor/Property/Obnam.hs +++ b/Propellor/Property/Obnam.hs @@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc where desc = dir ++ " backed up by obnam" cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $ - intercalate ";" $ catMaybes + intercalate ";" $ map flockcmd $ catMaybes [ if numclients == OnlyClient then Just $ unwords $ [ "obnam" @@ -59,6 +59,7 @@ backup dir crontimes params numclients = cronjob `describe` desc , shellEscape dir ] ++ map shellEscape params ] + flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd -- | Restores a directory from an obnam backup. -- -- cgit v1.2.3