slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: fix auto-exit in local mode, clarify startup messages

Browse Source
This commit is contained in:
Simon Michael 2013-05-01 12:02:47 -07:00
parent b06c96c04c
commit 8873ffbe77
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hledger-web/Hledger/Web/Main.hs
View File

@ -20,7 +20,6 @@ import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
import Network.Wai.Handler.Launch (runUrlPort) import Network.Wai.Handler.Launch (runUrlPort)
-- --
import Prelude hiding (putStrLn) import Prelude hiding (putStrLn)
import Control.Concurrent (forkIO)
import Control.Monad (when) import Control.Monad (when)
import Data.Text (pack) import Data.Text (pack)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
@ -68,11 +67,12 @@ web opts j = do
,appExtra = Extra "" Nothing ,appExtra = Extra "" Nothing
} }
if server_ opts if server_ opts
then then do
putStrLn "Press ctrl-c to quit"
hFlush stdout
runSettings defaultSettings{settingsPort=p} app runSettings defaultSettings{settingsPort=p} app
else do else do
putStrLn "Launching web browser" >> hFlush stdout putStrLn "Starting web browser"
forkIO $ runUrlPort p "" app putStrLn "Web app will auto-exit after a few minutes with no browsers (or press ctrl-c)"
putStrLn "Press ENTER, or close browser windows for 2 minutes, to quit web app" >> hFlush stdout hFlush stdout
getLine >> exitSuccess runUrlPort p "" app