Skip to content
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

Warnings ghc822 #204

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Warnings ghc822 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89d0d8
Increase overall level of compiler warnings.
mmzx Feb 23, 2020
5d24a5d
Fix all warnings of ghc-8.2.2.
mmzx Feb 23, 2020
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
2 changes: 1 addition & 1 deletion Keter/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ withActions asc bconfig f =
return (p, c)
)
)
(\(port, cert) -> releasePort (ascPortPool asc) port)
(\(port, _) -> releasePort (ascPortPool asc) port)
(\(port, cert) -> loop
stanzas
(wac { waconfigPort = port } : wacs)
Expand Down
4 changes: 2 additions & 2 deletions Keter/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import Data.Text.Encoding (encodeUtf8)
import qualified Data.Text.Read
import Data.Time (getCurrentTime)
import Data.Yaml.FilePath
import qualified Network.HTTP.Conduit as HTTP (conduitManagerSettings,
import qualified Network.HTTP.Conduit as HTTP (tlsManagerSettings,
newManager)
import Prelude hiding (FilePath, log)
import System.Directory (createDirectoryIfMissing,
Expand Down Expand Up @@ -208,7 +208,7 @@ listDirectoryTree fp = do

startListening :: KeterConfig -> HostMan.HostManager -> IO ()
startListening KeterConfig {..} hostman = do
manager <- HTTP.newManager HTTP.conduitManagerSettings
manager <- HTTP.newManager HTTP.tlsManagerSettings
runAndBlock kconfigListeners $ Proxy.reverseProxy
kconfigIpFromHeader
-- calculate the number of microseconds since the
Expand Down
4 changes: 4 additions & 0 deletions Keter/Proxy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import Network.HTTP.ReverseProxy (defaultWaiProxySettings,
import Network.HTTP.ReverseProxy (ProxyDest (ProxyDest),
SetIpHeader (..),
WaiProxyResponse (..),
WaiProxySettings,
LocalWaiProxySettings,
setLpsTimeBound,
waiProxyToSettings,
Expand All @@ -55,7 +56,10 @@ import WaiAppStatic.Listing (defaultListing)
import qualified Network.TLS as TLS

#if !MIN_VERSION_http_reverse_proxy(0,6,0)
defaultWaiProxySettings :: WaiProxySettings
defaultWaiProxySettings = def

defaultLocalWaiProxySettings :: LocalWaiProxySettings
defaultLocalWaiProxySettings = def
#endif

Expand Down
1 change: 0 additions & 1 deletion Keter/Types/Middleware.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Network.Wai

import Control.Monad
import Control.Arrow ((***))
import Control.Applicative

-- various Middlewares
import Network.Wai.Middleware.AcceptOverride (acceptOverride)
Expand Down
2 changes: 1 addition & 1 deletion Keter/Types/V10.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Data.Aeson (FromJSON (..),
Value (Object, String, Bool),
withObject, withBool, (.!=), (.:),
(.:?))
import Data.Aeson (Value (Bool), object, (.=))
import Data.Aeson (object, (.=))
import qualified Data.CaseInsensitive as CI
import Data.Conduit.Network (HostPreference)
import Data.Default
Expand Down
2 changes: 1 addition & 1 deletion keter.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Executable keter
Main-is: keter.hs
hs-source-dirs: main
Build-depends: base, keter, data-default, filepath
ghc-options: -threaded -Wall
ghc-options: -threaded -Weverything -Wcompat
other-modules: Paths_keter

test-suite test
Expand Down