summaryrefslogtreecommitdiff
path: root/Command/WebApp.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-01 16:40:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-01 16:40:38 -0400
commitd7a2600edd1989934c61ae5a80fdc2ee385d49c5 (patch)
tree9529886ec138e56ae4be2f9b52b869c0c4a1bd0f /Command/WebApp.hs
parentca512f1450d919397b6eb4fbc54e32e70677c8f7 (diff)
webapp is no longer a daemon
Remove --foreground and --stop options from it.
Diffstat (limited to 'Command/WebApp.hs')
-rw-r--r--Command/WebApp.hs13
1 files changed, 4 insertions, 9 deletions
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index 20b914b7a..f143d8667 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -16,7 +16,6 @@ import Assistant.Threads.WebApp
import Utility.WebApp
import Utility.Daemon (checkDaemon, lockPidFile)
import Init
-import qualified Command.Watch
import qualified Git.CurrentRepo
import qualified Annex
@@ -25,18 +24,14 @@ import Control.Concurrent.STM
def :: [Command]
def = [oneShot $ noRepo firstRun $ dontCheck repoExists $
- withOptions [Command.Watch.stopOption] $
command "webapp" paramNothing seek "launch webapp"]
seek :: [CommandSeek]
-seek = [withFlag Command.Watch.stopOption $ \stopdaemon ->
- withNothing $ start stopdaemon]
+seek = [withNothing start]
-start :: Bool -> CommandStart
-start stopdaemon = notBareRepo $ do
- if stopdaemon
- then stopDaemon
- else ifM (isInitialized) ( go , liftIO firstRun )
+start :: CommandStart
+start = notBareRepo $ do
+ ifM (isInitialized) ( go , liftIO firstRun )
stop
where
go = do