Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

retry once on exit 6 for list

Browse Source
This commit is contained in:
Keagan McClelland
2021-03-15 11:58:10 -06:00
parent ac5dec476d
commit 7bdc109bd4
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
agent/src/Lib/Algebra/Domain/AppMgr.hs
View File

@@ -11,8 +11,7 @@ module Lib.Algebra.Domain.AppMgr
( module Lib.Algebra.Domain.AppMgr ( module Lib.Algebra.Domain.AppMgr
, module Lib.Algebra.Domain.AppMgr.Types , module Lib.Algebra.Domain.AppMgr.Types
, module Lib.Algebra.Domain.AppMgr.TH , module Lib.Algebra.Domain.AppMgr.TH
) ) where
where
import Startlude import Startlude
@@ -26,31 +25,31 @@ import Data.Singletons.Prelude hiding ( Error )
import Data.Singletons.Prelude.Either import Data.Singletons.Prelude.Either
import qualified Data.String as String import qualified Data.String as String
import Lib.Algebra.Domain.AppMgr.Types import Control.Monad.Base ( MonadBase(..) )
import Control.Monad.Fail ( MonadFail(fail) )
import Control.Monad.Trans.Class ( MonadTrans )
import Control.Monad.Trans.Control ( MonadBaseControl(..)
, MonadTransControl(..)
, defaultLiftBaseWith
, defaultRestoreM
)
import Control.Monad.Trans.Resource ( MonadResource(..) )
import qualified Data.ByteString.Char8 as C8
import qualified Data.ByteString.Lazy as LBS
import Data.String.Interpolate.IsString
( i )
import Lib.Algebra.Domain.AppMgr.TH import Lib.Algebra.Domain.AppMgr.TH
import Lib.Algebra.Domain.AppMgr.Types
import Lib.Error import Lib.Error
import qualified Lib.External.AppManifest as Manifest import qualified Lib.External.AppManifest as Manifest
import Lib.TyFam.ConditionalData import Lib.TyFam.ConditionalData
import Lib.Types.Core ( AppId(..) import Lib.Types.Core ( AppContainerStatus(..)
, AppContainerStatus(..) , AppId(..)
) )
import Lib.Types.NetAddress
import Lib.Types.Emver import Lib.Types.Emver
import Control.Monad.Trans.Class ( MonadTrans ) import Lib.Types.NetAddress
import qualified Data.ByteString.Lazy as LBS
import System.Process.Typed
import Data.String.Interpolate.IsString
( i )
import Control.Monad.Base ( MonadBase(..) )
import Control.Monad.Fail ( MonadFail(fail) )
import Control.Monad.Trans.Resource ( MonadResource(..) )
import Control.Monad.Trans.Control ( defaultLiftBaseWith
, defaultRestoreM
, MonadTransControl(..)
, MonadBaseControl(..)
)
import qualified Data.ByteString.Char8 as C8
import System.Process import System.Process
import System.Process.Typed
type InfoRes :: Either OnlyInfoFlag [IncludeInfoFlag] -> Type type InfoRes :: Either OnlyInfoFlag [IncludeInfoFlag] -> Type
@@ -371,13 +370,16 @@ instance (Has (Error S9Error) sig m, Algebra sig m, MonadIO m) => Algebra (AppMg
(L (List (SRight flags))) -> do (L (List (SRight flags))) -> do
let renderedFlags = (genInclusiveFlag <$> fromSing flags) <> ["--json"] let renderedFlags = (genInclusiveFlag <$> fromSing flags) <> ["--json"]
let args = "list" : renderedFlags let args = "list" : renderedFlags
(ec, out) <- readProcessInheritStderr "appmgr" args "" let runIt retryCount = do
res <- case ec of (ec, out) <- readProcessInheritStderr "appmgr" args ""
ExitSuccess -> case withSingI flags $ eitherDecodeStrict out of case ec of
Left e -> throwError $ AppMgrParseE (toS $ String.unwords args) (decodeUtf8 out) e ExitSuccess -> case withSingI flags $ eitherDecodeStrict out of
Right x -> pure x Left e -> throwError $ AppMgrParseE (toS $ String.unwords args) (decodeUtf8 out) e
ExitFailure n -> throwError $ AppMgrE "list" n Right x -> pure $ ctx $> x
pure $ ctx $> res ExitFailure 6 ->
if retryCount > 0 then runIt (retryCount - 1) else throwError $ AppMgrE "list" 6
ExitFailure n -> throwError $ AppMgrE "list" n
runIt (1 :: Word) -- with 1 retry
(L (Remove dryorpurge appId)) -> do (L (Remove dryorpurge appId)) -> do
let args = "remove" : case dryorpurge of let args = "remove" : case dryorpurge of
Left (DryRun True) -> ["--dry-run", show appId, "--json"] Left (DryRun True) -> ["--dry-run", show appId, "--json"]