From df0be41806f600691c253870967105b449127b51 Mon Sep 17 00:00:00 2001 From: Adam Ross Date: Tue, 16 Oct 2018 21:08:43 -0700 Subject: [PATCH] serving/helloworld-haskell: respect the port env var --- serving/samples/helloworld-haskell/README.md | 12 +++++++----- serving/samples/helloworld-haskell/app/Main.hs | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/serving/samples/helloworld-haskell/README.md b/serving/samples/helloworld-haskell/README.md index 02299acac01..effdada2aa7 100644 --- a/serving/samples/helloworld-haskell/README.md +++ b/serving/samples/helloworld-haskell/README.md @@ -1,8 +1,8 @@ # Hello World - Haskell sample A simple web app written in Haskell that you can use for testing. -It reads in an env variable `TARGET` and prints "Hello World: ${TARGET}!". If -TARGET is not specified, it will use "NOT SPECIFIED" as the TARGET. +It reads in an env variable `TARGET` and prints "Hello ${TARGET}!". If +TARGET is not specified, it will use "World" as the TARGET. ## Prerequisites @@ -63,9 +63,11 @@ following instructions recreate the source files from this folder. import Web.Scotty.Trans main :: IO () - main = do - t <- fromMaybe "World" <$> lookupEnv "TARGET" - scotty 8080 (route t) + main = do + t <- fromMaybe "World" <$> lookupEnv "TARGET" + pStr <- fromMaybe "8080" <$> lookupEnv "PORT" + let p = read pStr :: Int + scotty p (route t) route :: String -> ScottyM() route t = get "/" $ hello t diff --git a/serving/samples/helloworld-haskell/app/Main.hs b/serving/samples/helloworld-haskell/app/Main.hs index b16fc5f6a6d..0e35f7cbf23 100644 --- a/serving/samples/helloworld-haskell/app/Main.hs +++ b/serving/samples/helloworld-haskell/app/Main.hs @@ -11,7 +11,9 @@ import Web.Scotty.Trans main :: IO () main = do t <- fromMaybe "World" <$> lookupEnv "TARGET" - scotty 8080 (route t) + pStr <- fromMaybe "8080" <$> lookupEnv "PORT" + let p = read pStr :: Int + scotty p (route t) route :: String -> ScottyM() route t = get "/" $ hello t