cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-04-04 16:20:20 -04:00
parent 776ac21c36
commit da3976b9e2
Failed to extract signature
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Propellor/CmdLine.hs
View File

@ -8,6 +8,8 @@ import System.Log.Formatter
import System.Log.Handler (setFormatter, LogHandler) import System.Log.Handler (setFormatter, LogHandler)
import System.Log.Handler.Simple import System.Log.Handler.Simple
import System.PosixCompat import System.PosixCompat
import Control.Exception (bracket)
import System.Posix.IO
import Propellor import Propellor
import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Docker as Docker
@ -71,7 +73,7 @@ defaultMain getprops = do
go True cmdline = updateFirst cmdline $ go False cmdline go True cmdline = updateFirst cmdline $ go False cmdline
go False (Spin host) = withprops host $ const $ spin host go False (Spin host) = withprops host $ const $ spin host
go False (Run host) = ifM ((==) 0 <$> getRealUserID) go False (Run host) = ifM ((==) 0 <$> getRealUserID)
( withprops host ensureProperties ( onlyProcess $ withprops host ensureProperties
, go True (Spin host) , go True (Spin host)
) )
go False (Boot host) = withprops host $ boot go False (Boot host) = withprops host $ boot
@ -79,6 +81,18 @@ defaultMain getprops = do
withprops host a = maybe (unknownhost host) a $ withprops host a = maybe (unknownhost host) a $
headMaybe $ catMaybes $ map (\get -> get host) getprops headMaybe $ catMaybes $ map (\get -> get host) getprops
onlyProcess :: IO a -> IO a
onlyProcess a = bracket lock unlock (const a)
where
lock = do
l <- openFd lockfile ReadWrite Nothing defaultFileFlags
setLock l (WriteLock, AbsoluteSeek, 0, 0)
`catchIO` (const alreadyrunning)
return l
unlock = closeFd
alreadyrunning = error "Propellor is already running on this host!"
lockfile = localdir </> ".lock"
unknownhost :: HostName -> IO a unknownhost :: HostName -> IO a
unknownhost h = errorMessage $ unlines unknownhost h = errorMessage $ unlines
[ "Unknown host: " ++ h [ "Unknown host: " ++ h

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ propellor (0.2.3) UNRELEASED; urgency=medium
* docker: Fix laziness bug that caused running containers to be * docker: Fix laziness bug that caused running containers to be
unnecessarily stopped and committed. unnecessarily stopped and committed.
* Add locking so only one propellor can run at a time on a host.
-- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 15:58:03 -0400 -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 15:58:03 -0400