web: try using wai-launch-handler.. not working yet
This commit is contained in:
parent
b65bcb5fbd
commit
0a77eba02e
@ -17,6 +17,7 @@ import Settings -- (parseExtra)
|
|||||||
import Application (makeApplication)
|
import Application (makeApplication)
|
||||||
import Data.Conduit.Network (HostPreference(HostIPv4))
|
import Data.Conduit.Network (HostPreference(HostIPv4))
|
||||||
import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
|
import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
|
||||||
|
import Network.Wai.Handler.Launch (run, runUrl, runUrlPort)
|
||||||
--
|
--
|
||||||
import Prelude hiding (putStrLn)
|
import Prelude hiding (putStrLn)
|
||||||
import Control.Monad (when)
|
import Control.Monad (when)
|
||||||
@ -74,6 +75,7 @@ server baseurl port opts j = do
|
|||||||
, appHost = HostIPv4
|
, appHost = HostIPv4
|
||||||
, appExtra = Extra "" Nothing
|
, appExtra = Extra "" Nothing
|
||||||
})
|
})
|
||||||
runSettings defaultSettings
|
-- runSettings defaultSettings
|
||||||
{ settingsPort = port_ opts
|
-- { settingsPort = port_ opts
|
||||||
} app
|
-- } app
|
||||||
|
run app
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{-# LANGUAGE PackageImports #-}
|
{-# LANGUAGE PackageImports #-}
|
||||||
import "hledger-web" Application (getApplicationDev)
|
import "hledger-web" Application (getApplicationDev)
|
||||||
import Network.Wai.Handler.Warp
|
import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
|
||||||
(runSettings, defaultSettings, settingsPort)
|
import Network.Wai.Handler.Launch (run, runUrl, runUrlPort)
|
||||||
import Control.Concurrent (forkIO)
|
import Control.Concurrent (forkIO)
|
||||||
import System.Directory (doesFileExist, removeFile)
|
import System.Directory (doesFileExist, removeFile)
|
||||||
import System.Exit (exitSuccess)
|
import System.Exit (exitSuccess)
|
||||||
@ -12,9 +12,10 @@ main = do
|
|||||||
putStrLn "Starting devel application"
|
putStrLn "Starting devel application"
|
||||||
(port, app) <- getApplicationDev
|
(port, app) <- getApplicationDev
|
||||||
forkIO $
|
forkIO $
|
||||||
runSettings defaultSettings
|
-- runSettings defaultSettings
|
||||||
{ settingsPort = port
|
-- { settingsPort = port
|
||||||
} app
|
-- } app
|
||||||
|
run app
|
||||||
loop
|
loop
|
||||||
|
|
||||||
loop :: IO ()
|
loop :: IO ()
|
||||||
|
|||||||
@ -156,6 +156,7 @@ library
|
|||||||
, transformers
|
, transformers
|
||||||
, wai
|
, wai
|
||||||
, wai-extra
|
, wai-extra
|
||||||
|
, wai-handler-launch >= 1.3 && < 1.4
|
||||||
, warp
|
, warp
|
||||||
, yaml
|
, yaml
|
||||||
|
|
||||||
@ -245,6 +246,7 @@ executable hledger-web
|
|||||||
, transformers
|
, transformers
|
||||||
, wai
|
, wai
|
||||||
, wai-extra
|
, wai-extra
|
||||||
|
, wai-handler-launch >= 1.3 && < 1.4
|
||||||
, warp
|
, warp
|
||||||
, yaml
|
, yaml
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user