Skip to content

Remove unused code. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twittner merged 1 commit into from
Apr 18, 2017
Merged

Remove unused code. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions services/galley/src/Galley/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module Galley.App
, applog
, manager
, cstate
, counter
, createEnv
, extEnv

Expand Down Expand Up @@ -44,16 +43,11 @@ import Control.Monad.IO.Class
import Control.Monad.Reader
import Control.Monad.Trans.Control
import Data.Aeson (FromJSON)
import Data.Bits
import Data.ByteString.Conversion (toByteString')
import Data.IORef
import Data.Metrics.Middleware
import Data.Misc (Fingerprint, Rsa)
import Data.Word
import Data.Serialize.Get (runGetLazy)
import Data.String (fromString)
import Data.UUID (toWords)
import Data.UUID.V1
import Galley.Options
import Network.HTTP.Client (responseTimeoutMicro)
import Network.HTTP.Client.OpenSSL
Expand All @@ -79,7 +73,6 @@ data Env = Env
, _applog :: !Logger
, _manager :: !Manager
, _cstate :: !ClientState
, _counter :: !(IORef Word64)
, _extEnv :: !ExtEnv
}

Expand Down Expand Up @@ -129,7 +122,6 @@ createEnv m o = do
l <- new $ setOutput StdOut . setFormat Nothing $ defSettings
Env mempty m o l <$> initHttpManager o
<*> initCassandra o l
<*> initEventCounter
<*> initExtEnv

initCassandra :: Opts -> Logger -> IO ClientState
Expand Down Expand Up @@ -157,18 +149,6 @@ initHttpManager o =
, managerResponseTimeout = responseTimeoutMicro 10000000
}

initEventCounter :: IO (IORef Word64)
initEventCounter = newIORef =<< seed
where
seed :: MonadIO m => m Word64
seed = liftIO $ do
(a, b, c, d) <- maybe (error "no UUID") toWords <$> nextUUID
let x = fromIntegral a `shiftL` 96
.|. fromIntegral b `shiftL` 64
.|. fromIntegral c `shiftL` 32
.|. fromIntegral d
return $ x `mod` (maxBound :: Word64)

initExtEnv :: IO ExtEnv
initExtEnv = do
ctx <- Ssl.context
Expand Down