diff --git a/agent/src/Application.hs b/agent/src/Application.hs index 456b69e5e..956c869d6 100644 --- a/agent/src/Application.hs +++ b/agent/src/Application.hs @@ -113,7 +113,7 @@ makeFoundation appSettings = do appSelfUpdateSpecification <- newEmptyMVar appIsUpdating <- newIORef Nothing appIsUpdateFailed <- newIORef Nothing - appOSVersionLatest <- newIORef Nothing + appOsVersionLatest <- newIORef Nothing appBackgroundJobs <- newTVarIO (JobCache HM.empty) def <- getDefaultProcDevMetrics appProcDevMomentCache <- newIORef (now, mempty, def) diff --git a/agent/src/Foundation.hs b/agent/src/Foundation.hs index 1ed7e9942..a2af4dd05 100644 --- a/agent/src/Foundation.hs +++ b/agent/src/Foundation.hs @@ -69,7 +69,7 @@ data AgentCtx = AgentCtx , appWebServerThreadId :: IORef (Maybe ThreadId) , appIsUpdating :: IORef (Maybe Version) , appIsUpdateFailed :: IORef (Maybe S9Error) - , appOSVersionLatest :: IORef (Maybe OsVersionCache) + , appOsVersionLatest :: IORef (Maybe OsVersionCache) , appProcDevMomentCache :: IORef (UTCTime, ProcDevMomentStats, ProcDevMetrics) , appSelfUpdateSpecification :: MVar VersionRange , appBackgroundJobs :: TVar JobCache diff --git a/agent/src/Handler/V0.hs b/agent/src/Handler/V0.hs index 10c67590e..9e21ede6c 100644 --- a/agent/src/Handler/V0.hs +++ b/agent/src/Handler/V0.hs @@ -61,7 +61,7 @@ getServerR = handleS9ErrT $ do wifi <- WpaSupplicant.runWlan0 $ liftA2 WifiList WpaSupplicant.getCurrentNetwork WpaSupplicant.listNetworks specs <- getSpecs settings welcomeAck <- fmap isJust . lift . runDB . Persist.get $ WelcomeAckKey agentVersion - versionLatest <- liftIO $ (try @SomeException $ getOSVersionLatest agentCtx) >>= \case + versionLatest <- liftIO $ (try @SomeException $ getOsVersionLatest agentCtx) >>= \case Left e -> (putStrLn @Text $ "Error fetching latest OS Version: " <> show e) $> Nothing Right a -> pure a @@ -150,8 +150,8 @@ patchNullableFile path = do expirationOsVersionLatest :: Num a => a expirationOsVersionLatest = 60 -getOSVersionLatest :: MonadIO m => AgentCtx -> m (Maybe Version) -getOSVersionLatest ctx = do +getOsVersionLatest :: MonadIO m => AgentCtx -> m (Maybe Version) +getOsVersionLatest ctx = do now <- liftIO getCurrentTime let osVersionCache = appOSVersionLatest ctx mCache <- liftIO . readIORef $ osVersionCache