diff options
| author | hallgren <hallgren@chalmers.se> | 2011-12-14 15:28:27 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2011-12-14 15:28:27 +0000 |
| commit | 15678a0fced17d9ed40b8a79985820b15dcc11d8 (patch) | |
| tree | 17cde9c086c3920c702adaa85cd4ccff5626a7dd /src/compiler/GF | |
| parent | 02bcfa209872699a3bdb0562c15f74100da4d983 (diff) | |
gf -server[=port]
You can now specify which port the HTTP server should run on in server mode.
The default is 41296.
Diffstat (limited to 'src/compiler/GF')
| -rw-r--r-- | src/compiler/GF/Infra/Option.hs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index 74020f03b..85088cba3 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -74,7 +74,7 @@ errors = fail . unlines -- Types data Mode = ModeVersion | ModeHelp | ModeInteractive | ModeRun | ModeCompiler - | ModeServer + | ModeServer Int{-port-} deriving (Show,Eq,Ord) data Verbosity = Quiet | Normal | Verbose | Debug @@ -286,7 +286,8 @@ optDescr = Option [] ["batch"] (NoArg (mode ModeCompiler)) "Run in batch compiler mode.", Option [] ["interactive"] (NoArg (mode ModeInteractive)) "Run in interactive mode (default).", Option [] ["run"] (NoArg (mode ModeRun)) "Run in interactive mode, showing output only (no other messages).", - Option [] ["server"] (NoArg (mode ModeServer)) "Run in HTTP server mode.", + Option [] ["server"] (OptArg modeServer "port") $ + "Run in HTTP server mode on given port (default "++show defaultPort++").", Option [] ["tags"] (NoArg (set $ \o -> o{optMode = ModeCompiler, optTagsOnly = True})) "Build TAGS file and exit.", Option ['E'] [] (NoArg (phase Preproc)) "Stop after preprocessing (with --preproc).", Option ['C'] [] (NoArg (phase Convert)) "Stop after conversion to .gf.", @@ -361,6 +362,12 @@ optDescr = ] where phase x = set $ \o -> o { optStopAfterPhase = x } mode x = set $ \o -> o { optMode = x } + defaultPort = 41296 + modeServer = maybe (ms defaultPort) readPort + where + ms = mode . ModeServer + readPort p = maybe err ms (readMaybe p) + where err = fail $ "Bad server port: "++p verbosity mv = case mv of Nothing -> set $ \o -> o { optVerbosity = Verbose } Just v -> case readMaybe v >>= toEnumBounded of |