From a9f526bb39f12fe8c8f3209d0e2b317d830ec496 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Aug 2014 11:28:33 +0300 Subject: [PATCH] Scaffolding changes for Ctrl-C --- yesod-bin/hsfiles/mongo.hsfiles | 9 +++++++++ yesod-bin/hsfiles/mysql.hsfiles | 9 +++++++++ yesod-bin/hsfiles/postgres-fay.hsfiles | 9 +++++++++ yesod-bin/hsfiles/postgres.hsfiles | 9 +++++++++ yesod-bin/hsfiles/simple.hsfiles | 9 +++++++++ yesod-bin/hsfiles/sqlite.hsfiles | 9 +++++++++ 6 files changed, 54 insertions(+) diff --git a/yesod-bin/hsfiles/mongo.hsfiles b/yesod-bin/hsfiles/mongo.hsfiles index f1a7f36f..654ed6f2 100644 --- a/yesod-bin/hsfiles/mongo.hsfiles +++ b/yesod-bin/hsfiles/mongo.hsfiles @@ -878,6 +878,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -887,8 +888,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app diff --git a/yesod-bin/hsfiles/mysql.hsfiles b/yesod-bin/hsfiles/mysql.hsfiles index 1ac4e7f7..3929b2d2 100644 --- a/yesod-bin/hsfiles/mysql.hsfiles +++ b/yesod-bin/hsfiles/mysql.hsfiles @@ -908,6 +908,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -917,8 +918,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app diff --git a/yesod-bin/hsfiles/postgres-fay.hsfiles b/yesod-bin/hsfiles/postgres-fay.hsfiles index e10831fa..8db29eda 100644 --- a/yesod-bin/hsfiles/postgres-fay.hsfiles +++ b/yesod-bin/hsfiles/postgres-fay.hsfiles @@ -932,6 +932,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -941,8 +942,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app diff --git a/yesod-bin/hsfiles/postgres.hsfiles b/yesod-bin/hsfiles/postgres.hsfiles index f3572bdd..788bb6f3 100644 --- a/yesod-bin/hsfiles/postgres.hsfiles +++ b/yesod-bin/hsfiles/postgres.hsfiles @@ -882,6 +882,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -891,8 +892,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app diff --git a/yesod-bin/hsfiles/simple.hsfiles b/yesod-bin/hsfiles/simple.hsfiles index 1b4eac4f..1fdd7d3b 100644 --- a/yesod-bin/hsfiles/simple.hsfiles +++ b/yesod-bin/hsfiles/simple.hsfiles @@ -756,6 +756,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -765,8 +766,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app diff --git a/yesod-bin/hsfiles/sqlite.hsfiles b/yesod-bin/hsfiles/sqlite.hsfiles index f46a5b89..c667b909 100644 --- a/yesod-bin/hsfiles/sqlite.hsfiles +++ b/yesod-bin/hsfiles/sqlite.hsfiles @@ -878,6 +878,7 @@ Production: web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# START_FILE devel.hs #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp @@ -887,8 +888,16 @@ import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) import Control.Concurrent (threadDelay) +#ifndef mingw32_HOST_OS +import System.Posix.Signals (installHandler, sigINT, Handler(Catch)) +#endif + main :: IO () main = do +#ifndef mingw32_HOST_OS + _ <- installHandler sigINT (Catch $ return ()) Nothing +#endif + putStrLn "Starting devel application" (port, app) <- getApplicationDev forkIO $ runSettings (setPort port defaultSettings) app