SunRed/myriad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

logs: fix time unit of output

Browse source
This commit is contained in:
1computer1 2020-06-22 03:10:24 -04:00
parent c952aa448c
commit 1c2ad37d60
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Myriad/Docker.hs
View file

@ -69,15 +69,17 @@ startCleanup :: Myriad ()
startCleanup = do
config <- gview #config
when (config ^. #cleanupInterval > 0) . void $ do
let t = fromIntegral (config ^. #cleanupInterval) * 60000000
let t = fromIntegral (config ^. #cleanupInterval)
fork $ timer t
where
-- Given time in minutes
timer :: Int -> Myriad ()
timer t = forever $ do
threadDelay t
-- Takes time in microseconds
threadDelay $ t * 60000000
logInfo ["Starting cleanup of containers"]
n <- killContainers
logInfo ["Cleaned up ", cs $ show n, " containers, next in ", cs $ show t, " seconds"]
logInfo ["Cleaned up ", cs $ show n, " containers, next in ", cs $ show t, " minutes"]
timer t
setupContainer :: Language -> Myriad ContainerName
@ -202,8 +204,11 @@ evalCode lang numRetries code = withContainer $ \cnt -> do
timer :: ContainerName -> MVar Bool -> Myriad ()
timer cnt doneRef = do
logDebug ["Starting timeout of ", cs . show $ lang ^. #timeout, " seconds for container ", cs cnt]
threadDelay $ fromIntegral (lang ^. #timeout) * 1000000
-- Given time in seconds
let t = fromIntegral $ lang ^. #timeout
logDebug ["Starting timeout of ", cs . show $ t, " seconds for container ", cs cnt]
-- Takes time in microseconds
threadDelay $ t * 1000000
done <- readMVar doneRef
if done
then do